--- a/tests/test-bookmarks.t Fri Mar 11 11:44:03 2016 -0800
+++ b/tests/test-bookmarks.t Sat Mar 12 04:35:42 2016 +0900
@@ -599,7 +599,6 @@
$ hg -R ../cloned-bookmarks-manual-update update
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (activating bookmark Y)
(all in one version)
@@ -643,7 +642,6 @@
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (activating bookmark Y)
1 other divergent bookmarks for "Y"
test wrongly formated bookmark
@@ -738,9 +736,11 @@
no-op update doesn't deactive bookmarks
+ $ hg bookmarks
+ * four 3:9ba5f110a0b3
+ should-end-on-two 2:db815d6d32e6
$ hg up four
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (activating bookmark four)
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg sum