tests/test-issue612
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Wed, 02 Jul 2008 12:02:33 +0200
changeset 6796 943f066c0d58
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Backed out changeset 4879468fa28f (incorrect Content-Length on Windows)

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