tests/test-issue612
author Christian Ebert <blacktrash@gmx.net>
Wed, 03 Oct 2007 21:01:47 +0200
changeset 5359 645a40777fd4
parent 4820 9797124581c9
permissions -rwxr-xr-x
test-convert-cvs: handle older cvs client

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