tests/test-pull-update
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Oct 2007 14:23:28 +0200
changeset 5361 8ab7de07f40e
parent 5097 73fdc8bd3ed8
permissions -rwxr-xr-x
test-convert-git: support older git client (1.4.4.4)

#!/bin/sh
#

hg init t
cd t
echo 1 > foo
hg ci -Am m

cd ..
hg clone t tt
cd tt
echo 1.1 > foo
hg ci -Am m

cd ../t
echo 1.2 > foo
hg ci -Am m
echo % should fail
hg pull -u ../tt

cd ../tt
echo % should fail
hg pull -u ../t
HGMERGE=true hg merge
hg ci -mm

cd ../t
echo % should work
hg pull -u ../tt