Show More
@@ -949,6 +949,9 b' def _dryrunrebase(ui, repo, action, opts' | |||||
949 | except error.InMemoryMergeConflictsError: |
|
949 | except error.InMemoryMergeConflictsError: | |
950 | ui.status(_('hit a merge conflict\n')) |
|
950 | ui.status(_('hit a merge conflict\n')) | |
951 | return 1 |
|
951 | return 1 | |
|
952 | except error.Abort: | |||
|
953 | needsabort = False | |||
|
954 | raise | |||
952 | else: |
|
955 | else: | |
953 | if confirm: |
|
956 | if confirm: | |
954 | ui.status(_('rebase completed successfully\n')) |
|
957 | ui.status(_('rebase completed successfully\n')) |
@@ -214,7 +214,7 b" BUG: cycles aren't flagged correctly whe" | |||||
214 | > | |
|
214 | > | | |
215 | > Z |
|
215 | > Z | |
216 | > EOS |
|
216 | > EOS | |
217 | abort: no rebase in progress |
|
217 | abort: source and destination form a cycle | |
218 | starting dry-run rebase; repository will not be changed |
|
218 | starting dry-run rebase; repository will not be changed | |
219 | [255] |
|
219 | [255] | |
220 |
|
220 |
General Comments 0
You need to be logged in to leave comments.
Login now