Mercurial > hg

view tests/test-pull-update @ 5763:e20de0caf8e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show number of changesets written to bundle files by default (issue569) This was only shown with -v before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Dec 2007 19:46:13 +0100
parents 73fdc8bd3ed8
children
line wrap: on
line source

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