Mercurial > hg
comparison tests/test-bookmarks.t @ 25893:04ae6feb04c5
test-bookmarks.t: avoid nested repo
This is (a) pretty unnecessary and (b) breaks tests for the third-party
hgwatchman extension, which doesn't support nested repos.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 02 Aug 2015 21:56:38 -0700 |
| parents | 95dc4b009f60 |
| children | 91cad8eb7951 |
comparison
equal
deleted
inserted
replaced
| 25892:3df1574f3e75 | 25893:04ae6feb04c5 |
|---|---|
| 509 $ hg -R cloned-bookmarks-rev bookmarks | 509 $ hg -R cloned-bookmarks-rev bookmarks |
| 510 X2 1:925d80f479bb | 510 X2 1:925d80f479bb |
| 511 | 511 |
| 512 test clone with update to a bookmark | 512 test clone with update to a bookmark |
| 513 | 513 |
| 514 $ hg clone -u Z . cloned-bookmarks-update | 514 $ hg clone -u Z . ../cloned-bookmarks-update |
| 515 updating to branch default | 515 updating to branch default |
| 516 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 516 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 517 $ hg -R cloned-bookmarks-update bookmarks | 517 $ hg -R ../cloned-bookmarks-update bookmarks |
| 518 X2 1:925d80f479bb | 518 X2 1:925d80f479bb |
| 519 Y 2:db815d6d32e6 | 519 Y 2:db815d6d32e6 |
| 520 * Z 2:db815d6d32e6 | 520 * Z 2:db815d6d32e6 |
| 521 x y 2:db815d6d32e6 | 521 x y 2:db815d6d32e6 |
| 522 | 522 |
| 567 | 567 |
| 568 pull --update works the same as pull && update | 568 pull --update works the same as pull && update |
| 569 | 569 |
| 570 $ hg bookmark -r3 Y | 570 $ hg bookmark -r3 Y |
| 571 moving bookmark 'Y' forward from db815d6d32e6 | 571 moving bookmark 'Y' forward from db815d6d32e6 |
| 572 $ hg -R cloned-bookmarks-update update Y | 572 $ hg -R ../cloned-bookmarks-update update Y |
| 573 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 573 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 574 (activating bookmark Y) | 574 (activating bookmark Y) |
| 575 $ hg -R cloned-bookmarks-update pull --update . | 575 $ hg -R ../cloned-bookmarks-update pull --update . |
| 576 pulling from . | 576 pulling from . |
| 577 searching for changes | 577 searching for changes |
| 578 adding changesets | 578 adding changesets |
| 579 adding manifests | 579 adding manifests |
| 580 adding file changes | 580 adding file changes |