equal
deleted
inserted
replaced
1 $ hg init |
1 $ hg init repo |
|
2 $ cd repo |
2 |
3 |
3 no bookmarks |
4 no bookmarks |
4 |
5 |
5 $ hg bookmarks |
6 $ hg bookmarks |
6 no bookmarks set |
7 no bookmarks set |
628 * Y 2:db815d6d32e6 |
629 * Y 2:db815d6d32e6 |
629 Y@1 1:925d80f479bb |
630 Y@1 1:925d80f479bb |
630 Z 2:db815d6d32e6 |
631 Z 2:db815d6d32e6 |
631 x y 2:db815d6d32e6 |
632 x y 2:db815d6d32e6 |
632 $ hg -R ../cloned-bookmarks-manual-update-with-divergence pull |
633 $ hg -R ../cloned-bookmarks-manual-update-with-divergence pull |
633 pulling from $TESTTMP |
634 pulling from $TESTTMP/repo (glob) |
634 searching for changes |
635 searching for changes |
635 adding changesets |
636 adding changesets |
636 adding manifests |
637 adding manifests |
637 adding file changes |
638 adding file changes |
638 added 2 changesets with 2 changes to 2 files (+1 heads) |
639 added 2 changesets with 2 changes to 2 files (+1 heads) |