tests/test-issue612
author Martin Geisler <mg@daimi.au.dk>
Sat, 03 Jan 2009 16:15:11 +0100
changeset 7597 81f68565281c
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
mq, i18n: 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