##// END OF EJS Templates
update: omit redundant activating message for already active bookmark...
FUJIWARA Katsunori -
r28500:2e1bceee default
parent child Browse files
Show More
@@ -7121,8 +7121,9 b' def update(ui, repo, node=None, rev=None'
7121 repo._activebookmark)
7121 repo._activebookmark)
7122 bookmarks.deactivate(repo)
7122 bookmarks.deactivate(repo)
7123 elif brev in repo._bookmarks:
7123 elif brev in repo._bookmarks:
7124 if brev != repo._activebookmark:
7125 ui.status(_("(activating bookmark %s)\n") % brev)
7124 bookmarks.activate(repo, brev)
7126 bookmarks.activate(repo, brev)
7125 ui.status(_("(activating bookmark %s)\n") % brev)
7126 elif brev:
7127 elif brev:
7127 if repo._activebookmark:
7128 if repo._activebookmark:
7128 ui.status(_("(leaving bookmark %s)\n") %
7129 ui.status(_("(leaving bookmark %s)\n") %
@@ -22,9 +22,10 b' list bookmarks with color'
22
22
23 update to bookmark X
23 update to bookmark X
24
24
25 $ hg bookmarks
26 * X -1:000000000000
25 $ hg update X
27 $ hg update X
26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 (activating bookmark X)
28
29
29 list bookmarks
30 list bookmarks
30
31
@@ -599,7 +599,6 b' pull --update works the same as pull && '
599 $ hg -R ../cloned-bookmarks-manual-update update
599 $ hg -R ../cloned-bookmarks-manual-update update
600 updating to active bookmark Y
600 updating to active bookmark Y
601 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
601 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
602 (activating bookmark Y)
603
602
604 (all in one version)
603 (all in one version)
605
604
@@ -643,7 +642,6 b' We warn about divergent during bare upda'
643 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update
642 $ hg -R ../cloned-bookmarks-manual-update-with-divergence update
644 updating to active bookmark Y
643 updating to active bookmark Y
645 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
644 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
646 (activating bookmark Y)
647 1 other divergent bookmarks for "Y"
645 1 other divergent bookmarks for "Y"
648
646
649 test wrongly formated bookmark
647 test wrongly formated bookmark
@@ -738,9 +736,11 b' tipmost surviving ancestor of the stripp'
738
736
739 no-op update doesn't deactive bookmarks
737 no-op update doesn't deactive bookmarks
740
738
739 $ hg bookmarks
740 * four 3:9ba5f110a0b3
741 should-end-on-two 2:db815d6d32e6
741 $ hg up four
742 $ hg up four
742 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
743 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
743 (activating bookmark four)
744 $ hg up
744 $ hg up
745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
746 $ hg sum
746 $ hg sum
General Comments 0
You need to be logged in to leave comments. Login now