view tests/test-586 @ 4592:5243cece3d97

Add --import-branch option to hg import to pull in branch information without --exact
author Eric Hopper <hopper@omnifarious.org>
date Thu, 14 Jun 2007 09:01:51 -0700
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line 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