Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 17736:1c523c4008f7
merge with crew-stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 09 Oct 2012 09:45:44 +0200 |
parents | 009db477c9fb 605fe310691f |
children | 434e5bd615fc |
line wrap: on
line diff
--- 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