tests/test-pull-update
author Cédric Duval <cedricduval@free.fr>
Sun, 21 Jun 2009 20:34:58 +0200
changeset 8896 b793ce68f082
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
extensions: remove import rendered unnecessary by e4e22a310b62

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