tests/test-pull-update
author Patrick Mezard <pmezard@gmail.com>
Mon, 18 Jan 2010 22:59:32 +0100
changeset 10260 fe699ca08a45
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
templatekw: fix extras, manifest and showlist args (issue1989) Removing the explicit parameters from keywords signature is easier than copying and reproducing the original argument list.

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