Show More
@@ -250,7 +250,9 b' class rebaseruntime(object):' | |||
|
250 | 250 | state = {} |
|
251 | 251 | destmap = {} |
|
252 | 252 | |
|
253 | try: | |
|
253 | if not self.stateobj.exists(): | |
|
254 | cmdutil.wrongtooltocontinue(repo, _('rebase')) | |
|
255 | else: | |
|
254 | 256 | f = repo.vfs("rebasestate") |
|
255 | 257 | for i, l in enumerate(f.read().splitlines()): |
|
256 | 258 | if i == 0: |
@@ -290,11 +292,6 b' class rebaseruntime(object):' | |||
|
290 | 292 | else: |
|
291 | 293 | state[oldrev] = repo[newrev].rev() |
|
292 | 294 | |
|
293 | except IOError as err: | |
|
294 | if err.errno != errno.ENOENT: | |
|
295 | raise | |
|
296 | cmdutil.wrongtooltocontinue(repo, _('rebase')) | |
|
297 | ||
|
298 | 295 | if data['keepbranches'] is None: |
|
299 | 296 | raise error.Abort(_('.hg/rebasestate is incomplete')) |
|
300 | 297 |
General Comments 0
You need to be logged in to leave comments.
Login now