branch | stable |
changeset 20523 | f2a0a0e76b4c |
parent 20327 | 46c2331fc750 |
child 20545 | 5936058f6bad |
child 20766 | 95aab23a806b |
--- 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"))