sapling/tests/test-pull-update

#!/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
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too. 2007-08-06 22:25:50 +04:00			`#!/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`