tests/test-586
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 10 Oct 2007 15:42:00 -0700
changeset 5437 71e7c86adcb7
parent 4536 720ae5085ee3
permissions -rwxr-xr-x
convert: refactor sink initialisation, to remove hardcoding of hg We also introduce options to explicitly set the source and destination repository types. Improve testing of corner cases a little.

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A