tests/test-issue612
author Matt Mackall <mpm@selenic.com>
Tue, 02 Dec 2008 13:06:18 -0600
changeset 7463 6aafd75fb924
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Added signature for changeset 2a67430f92f1

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