Mercurial > hg
view tests/test-pull-r @ 6298:53cbb33e1269
normallookup: during merges, restore the state saved by remove
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 8ede77c2d008 |
children | b8346ae5d64b |
line wrap: on
line source
#!/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 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