Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-pull-r @ 5276:aea35488ea66
merge with crew-stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 31 Aug 2007 22:31:43 +0200 |
| parents | 8ede77c2d008 |
| children |
comparison
equal
deleted
inserted
replaced
| 5275:d3874a286b51 | 5276:aea35488ea66 |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 hg init repo | |
| 4 cd repo | |
| 5 echo foo > foo | |
| 6 hg ci -qAm 'add foo' -d '0 0' | |
| 7 echo >> foo | |
| 8 hg ci -m 'change foo' -d '0 0' | |
| 9 hg up -qC 0 | |
| 10 echo bar > bar | |
| 11 hg ci -qAm 'add bar' -d '0 0' | |
| 12 hg log | |
| 13 cd .. | |
| 14 hg init copy | |
| 15 cd copy | |
| 16 | |
| 17 echo '% pull -r 0' | |
| 18 hg pull -qr 0 ../repo | |
| 19 hg log | |
| 20 | |
| 21 echo '% pull -r 1' | |
| 22 hg pull -qr 1 ../repo | |
| 23 hg log | |
| 24 | |
| 25 # this used to abort: received changelog group is empty | |
| 26 echo '% pull -r 1 again' | |
| 27 hg pull -qr 1 ../repo |