Mercurial > hg

view tests/test-pull-update @ 5900:1206e3dfc906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repair.py: nodes are nodes, revs are revs Use "striprev" instead of just "rev" to make the patch a bit less confusing. This is also a bit clearer than just "revnum".
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 19 Jan 2008 18:01:16 -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