changeset 17736 | 1c523c4008f7 |
parent 17717 | 009db477c9fb |
parent 17735 | 605fe310691f |
child 17773 | 434e5bd615fc |
--- a/mercurial/commands.py Mon Oct 08 15:57:21 2012 -0700 +++ b/mercurial/commands.py Tue Oct 09 09:45:44 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