Show More
@@ -892,7 +892,7 b' def abort(repo, originalwd, target, stat' | |||||
892 | # no backup of rebased cset versions needed |
|
892 | # no backup of rebased cset versions needed | |
893 | repair.strip(repo.ui, repo, strippoints) |
|
893 | repair.strip(repo.ui, repo, strippoints) | |
894 |
|
894 | |||
895 | if activebookmark: |
|
895 | if activebookmark and activebookmark in repo._bookmarks: | |
896 | bookmarks.setcurrent(repo, activebookmark) |
|
896 | bookmarks.setcurrent(repo, activebookmark) | |
897 |
|
897 | |||
898 | clearstatus(repo) |
|
898 | clearstatus(repo) |
@@ -90,3 +90,18 b' aborted rebase should restore active boo' | |||||
90 | * three 4:dd7c838e8362 |
|
90 | * three 4:dd7c838e8362 | |
91 | two 3:42e5ed2cdcf4 |
|
91 | two 3:42e5ed2cdcf4 | |
92 |
|
92 | |||
|
93 | after aborted rebase, restoring a bookmark that has been removed should not fail | |||
|
94 | ||||
|
95 | $ hg rebase -s three -d two | |||
|
96 | rebasing 4:dd7c838e8362 "4" (tip three) | |||
|
97 | merging d | |||
|
98 | warning: conflicts during merge. | |||
|
99 | merging d incomplete! (edit conflicts, then use 'hg resolve --mark') | |||
|
100 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |||
|
101 | [1] | |||
|
102 | $ hg bookmark -d three | |||
|
103 | $ hg rebase --abort | |||
|
104 | rebase aborted | |||
|
105 | $ hg bookmark | |||
|
106 | one 1:925d80f479bb | |||
|
107 | two 3:42e5ed2cdcf4 |
General Comments 0
You need to be logged in to leave comments.
Login now