view tests/test-586 @ 7049:6489ee64b522

fetch: use dirstate branch instead of first parents
author Sune Foldager <cryo@cyanite.org>
date Wed, 24 Sep 2008 13:22:11 +0200
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