tests/test-issue612
author Patrick Mezard <pmezard@gmail.com>
Tue, 21 Apr 2009 22:31:16 +0200
changeset 8123 933b874e402f
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
convert/mtn: handle files moved in a moved directory (issue1619/2)

#!/bin/sh

mkdir t
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

hg st