Mercurial > hg
comparison 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'".
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 15 Feb 2014 16:19:19 +0900 |
| parents | 46c2331fc750 |
| children | 5936058f6bad 95aab23a806b |
comparison
equal
deleted
inserted
replaced
| 20490:4e41b2fe46cc | 20523:f2a0a0e76b4c |
|---|---|
| 402 collapsedas = newrev | 402 collapsedas = newrev |
| 403 clearrebased(ui, repo, state, skipped, collapsedas) | 403 clearrebased(ui, repo, state, skipped, collapsedas) |
| 404 | 404 |
| 405 if currentbookmarks: | 405 if currentbookmarks: |
| 406 updatebookmarks(repo, targetnode, nstate, currentbookmarks) | 406 updatebookmarks(repo, targetnode, nstate, currentbookmarks) |
| 407 if activebookmark not in repo._bookmarks: | |
| 408 # active bookmark was divergent one and has been deleted | |
| 409 activebookmark = None | |
| 407 | 410 |
| 408 clearstatus(repo) | 411 clearstatus(repo) |
| 409 ui.note(_("rebase completed\n")) | 412 ui.note(_("rebase completed\n")) |
| 410 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | 413 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) |
| 411 if skipped: | 414 if skipped: |