Mercurial > hg

view tests/test-pull-update @ 12255:9b3c02c36d92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge-default
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 11 Sep 2010 11:44:53 +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