view tests/test-pull-update @ 10236:49a8625b8cac

shrink-revlog: help/doc tweaks - make it look right in 'hg help extensions' - clarify --revlog option - add a main program to tell users this is no longer a standalone script
author Greg Ward <greg-hg@gerg.ca>
date Tue, 12 Jan 2010 15:12:53 +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