Mercurial > hg

view tests/test-pull-update @ 7331:650e9d6988cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Keep sessionvars with repository links added in a0843c82d1a2 Without this, e.g. "?style=coal" would be dropped.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Nov 2008 13:22:41 +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