##// END OF EJS Templates
histedit: suggest the correct tool to continue (not histedit)...
timeless -
r28123:6c1b7f80 default
parent child Browse files
Show More
@@ -279,7 +279,7 b' class histeditstate(object):'
279 except IOError as err:
279 except IOError as err:
280 if err.errno != errno.ENOENT:
280 if err.errno != errno.ENOENT:
281 raise
281 raise
282 raise error.Abort(_('no histedit in progress'))
282 cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
283
283
284 if state.startswith('v1\n'):
284 if state.startswith('v1\n'):
285 data = self._load()
285 data = self._load()
@@ -133,6 +133,11 b' temporarily.'
133 (hg histedit --continue to resume)
133 (hg histedit --continue to resume)
134 [1]
134 [1]
135
135
136 $ hg graft --continue
137 abort: no graft in progress
138 (continue: hg histedit --continue)
139 [255]
140
136 $ mv .hg/histedit-state .hg/histedit-state.back
141 $ mv .hg/histedit-state .hg/histedit-state.back
137 $ hg update --quiet --clean 2
142 $ hg update --quiet --clean 2
138 $ echo alpha >> alpha
143 $ echo alpha >> alpha
General Comments 0
You need to be logged in to leave comments. Login now