view tests/test-pull-update @ 5221:8ede77c2d008

pull -r: pass the revisions as the heads argument of findincoming This can make a hg pull -r faster if the remote repo has many heads, and fixes an "abort: received changelog group is empty".
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 01:44:35 -0300
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