tests/test-issue612
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 01 Aug 2007 12:03:10 -0700
changeset 5043 8b1ee1f59b3c
parent 4820 9797124581c9
permissions -rwxr-xr-x
dirstate: improve error message on file/directory clash

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