equal
deleted
inserted
replaced
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: |