tests/test-issue612

12155:94ad12aa0530

cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

12156:4c94b6d0fb1c

cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama

hg mv src source
hg ci -Ammove

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate

hg st

hg merge