tests/test-pull-update
author Jason Harris <jason@jasonfharris.com>
Sat, 03 Jul 2010 05:24:16 +0200
changeset 11655 6faf015e0ba0
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
templates: 'children' keyword The template keyword 'parents' is already present and this just provides the complimentary template keyword.

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