tests/test-586
author Patrick Mezard <pmezard@gmail.com>
Mon, 14 Apr 2008 22:31:33 +0200
changeset 6538 05dff77bfbd9
parent 4535 720ae5085ee3
child 7564 f1af59451c0c
permissions -rwxr-xr-x
convert: fix subpaths detection in svn source

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