tests/test-issue612
author Wagner Bruna <wbruna@yahoo.com>
Sat, 10 Jul 2010 14:28:38 -0300
branchstable
changeset 11528 6f44bd4cc4f2
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
i18n-pt_BR: synchronized with dec57aa0f8ca

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