diff hgext/rebase.py @ 20523:f2a0a0e76b4c stable

rebase: do not try to reactivate deleted divergent bookmark

If the currently active bookmark is divergent one, it may be resolved during
rebase.  Trying to activate it will raise "KeyError: 'W@diverge'".

--- a/hgext/rebase.py	Thu Feb 13 13:05:09 2014 +0100
+++ b/hgext/rebase.py	Sat Feb 15 16:19:19 2014 +0900
@@ -404,6 +404,9 @@
 
         if currentbookmarks:
             updatebookmarks(repo, targetnode, nstate, currentbookmarks)
+            if activebookmark not in repo._bookmarks:
+                # active bookmark was divergent one and has been deleted
+                activebookmark = None
 
         clearstatus(repo)
         ui.note(_("rebase completed\n"))