tests/test-issue612
author Frank Kingswood <frank@kingswood-consulting.co.uk>
Mon, 01 Dec 2008 13:42:04 +0000
changeset 7465 8f0305874701
parent 4819 9797124581c9
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
tests: allow cvs import to reorder its filename list Also fix script to generate non-zero length test file b.

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