Comments
Patch
@@ -279,7 +279,8 @@
except IOError as err:
if err.errno != errno.ENOENT:
raise
- raise error.Abort(_('no histedit in progress'))
+ cmdutil.wrongtooltocontinue(self.repo,
+ _('no histedit in progress'))
if state.startswith('v1\n'):
data = self._load()
@@ -44,9 +44,12 @@
histedit --continue/--abort with no existing state
--------------------------------------------------
+ $ hg rm -q alpha
$ hg histedit --continue
abort: no histedit in progress
+ (continue: hg commit)
[255]
+ $ hg revert -r . -q alpha
$ hg histedit --abort
abort: no histedit in progress
[255]
@@ -133,6 +136,11 @@
(hg histedit --continue to resume)
[1]
+ $ hg graft --continue
+ abort: no graft state found, can't continue
+ (continue: hg histedit --continue)
+ [255]
+
$ mv .hg/histedit-state .hg/histedit-state.back
$ hg update --quiet --clean 2
$ echo alpha >> alpha