Mercurial > hg

view tests/test-pull-update @ 7139:bcbba59e233d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: use --prefix instead of --home Some SUSE version don't like --home, they fail with: "error: must supply either home or prefix/exec-prefix -- not both" this is due to SUSE shipping a distutils.cfg conflicting with --home.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 18 Oct 2008 21:08:44 +0200
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