# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2013-09-20 16:47:03
# Node ID ea35caf324bb04cbc9ab5e2328367bc50f558cfb
# Parent  e0666aaa1382f646501a2fdff85eb1f720aa9712
# Parent  478f3379768aecf737fed585f4b4de373784cabf

merge with stable

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -63,7 +63,7 @@ from mercurial.i18n import _
 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 @@ def strip(ui, repo, *revs, **opts):
             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)