Skip to content
Snippets Groups Projects
Commit 6025ddb4e649 authored by timeless's avatar timeless
Browse files

rebase: suggest the correct tool to continue (not rebase)

Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
parent bd97ed121016
No related branches found
No related tags found
No related merge requests found
......@@ -915,7 +915,7 @@
except IOError as err:
if err.errno != errno.ENOENT:
raise
raise error.Abort(_('no rebase in progress'))
cmdutil.wrongtooltocontinue(repo, _('rebase'))
if keepbranches is None:
raise error.Abort(_('.hg/rebasestate is incomplete'))
......
......@@ -481,6 +481,10 @@
$ hg resolve -m c2
(no more unresolved files)
continue: hg rebase --continue
$ hg graft --continue
abort: no graft in progress
(continue: hg rebase --continue)
[255]
$ hg rebase -c --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip)
note: rebase of 2:e4e3f3546619 created no changes to commit
......
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