Show More
@@ -1,4 +1,5 b'' | |||||
1 | $ hg init |
|
1 | $ hg init repo | |
|
2 | $ cd repo | |||
2 |
|
3 | |||
3 | no bookmarks |
|
4 | no bookmarks | |
4 |
|
5 | |||
@@ -630,7 +631,7 b' We warn about divergent during bare upda' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now