tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Jun 2007 23:42:06 -0300
changeset 4677 de8ec7e1753a
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
dirstate.status: if a file is marked as copied, consider it modified After a "hg copy --force --after somefile cleanfile", cleanfile shouldn't be considered clean anymore.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update