mercurial/commands.py
branchstable
changeset 17735 605fe310691f
parent 17392 bdd248666dbc
child 17736 1c523c4008f7
--- a/mercurial/commands.py	Thu Oct 04 16:30:40 2012 +0200
+++ b/mercurial/commands.py	Mon Oct 08 00:19:30 2012 +0200
@@ -846,6 +846,12 @@
             raise util.Abort(_("bookmark name required"))
         if len(marks) == 0:
             ui.status(_("no bookmarks set\n"))
+        if inactive:
+            if not repo._bookmarkcurrent:
+                ui.status(_("no active bookmark\n"))
+            else:
+                bookmarks.setcurrent(repo, None)
+            return
         else:
             for bmark, n in sorted(marks.iteritems()):
                 current = repo._bookmarkcurrent