Skip to content
Snippets Groups Projects
Commit 54e93b86a9e3 authored by Matt Mackall's avatar Matt Mackall
Browse files

rebase: improve --abort failure message

parent 7a9cf012dddc
No related branches found
No related tags found
No related merge requests found
......@@ -427,7 +427,7 @@
'Restore the repository to its original state'
if set(repo.changelog.descendants(target)) - set(state.values()):
repo.ui.warn(_("warning: new changesets detected on target branch, "
"not stripping\n"))
"can't abort\n"))
else:
# Strip from the first rebased revision
merge.update(repo, repo[originalwd].rev(), False, True, False)
......
......@@ -95,7 +95,7 @@
% Abort the rebasing
warning: new changesets detected on target branch, not stripping
warning: new changesets detected on target branch, can't abort
@ 6: Extra
|
o 5: B
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment