Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 25102:bb2f543b48b5

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, 15 May 2015 11:52:09 -0500
parents 5e111215e38b 91c2278c68a3
children 80c5b2666a96
line wrap: on
line diff
--- a/hgext/rebase.py	Tue Apr 14 12:53:48 2015 -0700
+++ b/hgext/rebase.py	Fri May 15 11:52:09 2015 -0500
@@ -890,7 +890,7 @@
             # no backup of rebased cset versions needed
             repair.strip(repo.ui, repo, strippoints)
 
-    if activebookmark:
+    if activebookmark and activebookmark in repo._bookmarks:
         bookmarks.activate(repo, activebookmark)
 
     clearstatus(repo)