view tests/test-586 @ 5028:36e8983fe44d

test-convert: Hide warning about missing subversion bindings.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 29 Jul 2007 19:32:55 +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