Mercurial > hg
comparison hgext/rebase.py @ 19926:0f99747202f9
rebase: preserve active bookmark when not at head (issue3813)
Now that the working directory parent is preserved, we can preserve the active
bookmark too.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 14 Oct 2013 17:12:59 +0200 |
| parents | 9c78ed396075 |
| children | d51c4d85ec23 |
comparison
equal
deleted
inserted
replaced
| 19925:9c78ed396075 | 19926:0f99747202f9 |
|---|---|
| 380 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | 380 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) |
| 381 if skipped: | 381 if skipped: |
| 382 ui.note(_("%d revisions have been skipped\n") % len(skipped)) | 382 ui.note(_("%d revisions have been skipped\n") % len(skipped)) |
| 383 | 383 |
| 384 if (activebookmark and | 384 if (activebookmark and |
| 385 repo['tip'].node() == repo._bookmarks[activebookmark]): | 385 repo['.'].node() == repo._bookmarks[activebookmark]): |
| 386 bookmarks.setcurrent(repo, activebookmark) | 386 bookmarks.setcurrent(repo, activebookmark) |
| 387 | 387 |
| 388 finally: | 388 finally: |
| 389 release(lock, wlock) | 389 release(lock, wlock) |
| 390 | 390 |