Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 25101:91c2278c68a3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: check that the bookmark is still valid when restoring (issue4669) After a rebase --abort, we attempt to restore the previously active bookmark. We need to ensure that the bookmark still exists.
author Tony Tung <tonytung@fb.com>
date Thu, 14 May 2015 21:35:06 -0700
parents bd98d073a34f
children bb2f543b48b5
line wrap: on
line diff
--- a/hgext/rebase.py	Fri May 15 22:32:31 2015 +0900
+++ b/hgext/rebase.py	Thu May 14 21:35:06 2015 -0700
@@ -892,7 +892,7 @@
             # no backup of rebased cset versions needed
             repair.strip(repo.ui, repo, strippoints)
 
-    if activebookmark:
+    if activebookmark and activebookmark in repo._bookmarks:
         bookmarks.setcurrent(repo, activebookmark)
 
     clearstatus(repo)