Mercurial > hg

diff hgext/mq.py @ 19763:ea35caf324bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 20 Sep 2013 11:47:03 -0500
parents 11fdf9f754b7 478f3379768a
children 5d6cfdc38a3d
line wrap: on
line diff
--- a/hgext/mq.py	Fri Sep 06 13:30:58 2013 +0400
+++ b/hgext/mq.py	Fri Sep 20 11:47:03 2013 -0500
@@ -63,7 +63,7 @@
 from mercurial.node import bin, hex, short, nullid, nullrev
 from mercurial.lock import release
 from mercurial import commands, cmdutil, hg, scmutil, util, revset
-from mercurial import repair, extensions, error, phases
+from mercurial import repair, extensions, error, phases, bookmarks
 from mercurial import patch as patchmod
 from mercurial import localrepo
 from mercurial import subrepo
@@ -3077,6 +3077,8 @@
             wlock.release()
 
     if opts.get('bookmark'):
+        if mark == repo._bookmarkcurrent:
+            bookmarks.setcurrent(repo, None)
         del marks[mark]
         marks.write()
         ui.write(_("bookmark '%s' deleted\n") % mark)