Show More
@@ -846,6 +846,12 b' def bookmark(ui, repo, mark=None, rev=No' | |||||
846 | raise util.Abort(_("bookmark name required")) |
|
846 | raise util.Abort(_("bookmark name required")) | |
847 | if len(marks) == 0: |
|
847 | if len(marks) == 0: | |
848 | ui.status(_("no bookmarks set\n")) |
|
848 | ui.status(_("no bookmarks set\n")) | |
|
849 | if inactive: | |||
|
850 | if not repo._bookmarkcurrent: | |||
|
851 | ui.status(_("no active bookmark\n")) | |||
|
852 | else: | |||
|
853 | bookmarks.setcurrent(repo, None) | |||
|
854 | return | |||
849 | else: |
|
855 | else: | |
850 | for bmark, n in sorted(marks.iteritems()): |
|
856 | for bmark, n in sorted(marks.iteritems()): | |
851 | current = repo._bookmarkcurrent |
|
857 | current = repo._bookmarkcurrent |
@@ -115,6 +115,13 b' deactivate current bookmark using -i' | |||||
115 | Z 0:719295282060 |
|
115 | Z 0:719295282060 | |
116 |
|
116 | |||
117 | $ hg up -q Y |
|
117 | $ hg up -q Y | |
|
118 | $ hg bookmark -i | |||
|
119 | $ hg bookmarks | |||
|
120 | Y 0:719295282060 | |||
|
121 | Z 0:719295282060 | |||
|
122 | $ hg bookmark -i | |||
|
123 | no active bookmark | |||
|
124 | $ hg up -q Y | |||
118 | $ hg bookmarks |
|
125 | $ hg bookmarks | |
119 | * Y 0:719295282060 |
|
126 | * Y 0:719295282060 | |
120 | Z 0:719295282060 |
|
127 | Z 0:719295282060 |
General Comments 0
You need to be logged in to leave comments.
Login now