##// END OF EJS Templates
rebase: improve --abort failure message
Matt Mackall -
r11204:54e93b86 default
parent child Browse files
Show More
@@ -427,7 +427,7 b' def abort(repo, originalwd, target, stat'
427 'Restore the repository to its original state'
427 'Restore the repository to its original state'
428 if set(repo.changelog.descendants(target)) - set(state.values()):
428 if set(repo.changelog.descendants(target)) - set(state.values()):
429 repo.ui.warn(_("warning: new changesets detected on target branch, "
429 repo.ui.warn(_("warning: new changesets detected on target branch, "
430 "not stripping\n"))
430 "can't abort\n"))
431 else:
431 else:
432 # Strip from the first rebased revision
432 # Strip from the first rebased revision
433 merge.update(repo, repo[originalwd].rev(), False, True, False)
433 merge.update(repo, repo[originalwd].rev(), False, True, False)
@@ -95,7 +95,7 b' o 0: A'
95
95
96
96
97 % Abort the rebasing
97 % Abort the rebasing
98 warning: new changesets detected on target branch, not stripping
98 warning: new changesets detected on target branch, can't abort
99 @ 6: Extra
99 @ 6: Extra
100 |
100 |
101 o 5: B
101 o 5: B
General Comments 0
You need to be logged in to leave comments. Login now