tests/test-pull-update
author David Soria Parra <dsp@php.net>
Sun, 20 Jun 2010 12:26:48 +0200
branchstable
changeset 11431 cac256790aa4
parent 5080 73fdc8bd3ed8
permissions -rwxr-xr-x
bookmarks: Add -B option to incoming/outgoing to compare bookmarks We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option is passed we compare bookmarks instead of changesets. This can be used to see which bookmarks do not exists on the remote site.

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