Mercurial > hg

view tests/test-pull-update @ 6182:07f2236c4dee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a blame alias for annotate The original cvs command was called blame. SVN has both, and other VC systems typically also have this as an alias. Makes things easier for converts.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 28 Feb 2008 19:08:04 +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