tests/test-pull-update
author Augie Fackler <durin42@gmail.com>
Tue, 12 Oct 2010 11:02:45 -0500
branchstable
changeset 12737 7adb1274a4f9
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
test-url: skip test when ssl module is unavailable

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