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