##// END OF EJS Templates
diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

File last commit:

r6405:b8346ae5 default
r7664:3cc74ee7 default
Show More
test-pull-r
30 lines | 475 B | text/plain | TextLexer
Alexis S. L. Carvalho
pull -r: pass the revisions as the heads argument of findincoming...
r5221 #!/bin/sh
hg init repo
cd repo
echo foo > foo
hg ci -qAm 'add foo' -d '0 0'
echo >> foo
hg ci -m 'change foo' -d '0 0'
hg up -qC 0
echo bar > bar
hg ci -qAm 'add bar' -d '0 0'
hg log
cd ..
hg init copy
cd copy
Patrick Mezard
commands: fix shadowed repo module
r6405 echo '% pull a missing revision'
hg pull -qr missing ../repo
Alexis S. L. Carvalho
pull -r: pass the revisions as the heads argument of findincoming...
r5221 echo '% pull -r 0'
hg pull -qr 0 ../repo
hg log
echo '% pull -r 1'
hg pull -qr 1 ../repo
hg log
# this used to abort: received changelog group is empty
echo '% pull -r 1 again'
hg pull -qr 1 ../repo