Comments
Patch
@@ -915,7 +915,7 @@
except IOError as err:
if err.errno != errno.ENOENT:
raise
- raise error.Abort(_('no rebase in progress'))
+ cmdutil.wrongtooltocontinue(repo, _('no rebase in progress'))
if keepbranches is None:
raise error.Abort(_('.hg/rebasestate is incomplete'))
@@ -56,9 +56,12 @@
Try to call --continue:
+ $ hg rm -q extra
$ hg rebase --continue
abort: no rebase in progress
+ (continue: hg commit)
[255]
+ $ hg revert -r . -q extra
Conflicting rebase:
@@ -495,6 +495,10 @@
$ hg resolve -m c2
(no more unresolved files)
continue: hg rebase --continue
+ $ hg graft --continue
+ abort: no graft state found, can't continue
+ (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