Show More
@@ -227,6 +227,9 b' class rebaseruntime(object):' | |||||
227 |
|
227 | |||
228 | def restorestatus(self): |
|
228 | def restorestatus(self): | |
229 | """Restore a previously stored status""" |
|
229 | """Restore a previously stored status""" | |
|
230 | if not self.stateobj.exists(): | |||
|
231 | cmdutil.wrongtooltocontinue(self.repo, _('rebase')) | |||
|
232 | ||||
230 | data = self._read() |
|
233 | data = self._read() | |
231 | self.repo.ui.debug('rebase status resumed\n') |
|
234 | self.repo.ui.debug('rebase status resumed\n') | |
232 |
|
235 | |||
@@ -250,9 +253,7 b' class rebaseruntime(object):' | |||||
250 | state = {} |
|
253 | state = {} | |
251 | destmap = {} |
|
254 | destmap = {} | |
252 |
|
255 | |||
253 | if not self.stateobj.exists(): |
|
256 | if True: | |
254 | cmdutil.wrongtooltocontinue(repo, _('rebase')) |
|
|||
255 | else: |
|
|||
256 | f = repo.vfs("rebasestate") |
|
257 | f = repo.vfs("rebasestate") | |
257 | for i, l in enumerate(f.read().splitlines()): |
|
258 | for i, l in enumerate(f.read().splitlines()): | |
258 | if i == 0: |
|
259 | if i == 0: |
General Comments 0
You need to be logged in to leave comments.
Login now