comparison tests/test-issue612 @ 4819:9797124581c9

merge: fix adding untracked files on directory rename (issue612)

Fix from Brendan
Added test case

4819:9797124581c9

#!/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