tests/test-pull-update
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Nov 2009 16:10:05 -0500
branchstable
changeset 10479 bb508b312359
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
bundle: exclude csets given in --base, unless they are in --rev (issue1910) Thanks Jesse Glick for the first version of this patch.

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