tests/test-issue612
author Martin Geisler <mg@lazybytes.net>
Wed, 17 Feb 2010 23:07:50 +0100
branchstable
changeset 10496 45734b51c99b
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
progress: mark strings for translation

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