tests/test-issue612
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 19 Jan 2009 12:59:56 +0100
changeset 7670 e5f445c94226
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
kill some trailing whitespace

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