Show More
@@ -420,6 +420,10 b' class rebaseruntime(object):' | |||||
420 | # Store the state before we begin so users can run 'hg rebase --abort' |
|
420 | # Store the state before we begin so users can run 'hg rebase --abort' | |
421 | # if we fail before the transaction closes. |
|
421 | # if we fail before the transaction closes. | |
422 | self.storestatus() |
|
422 | self.storestatus() | |
|
423 | if tr: | |||
|
424 | # When using single transaction, store state when transaction | |||
|
425 | # commits. | |||
|
426 | self.storestatus(tr) | |||
423 |
|
427 | |||
424 | cands = [k for k, v in self.state.iteritems() if v == revtodo] |
|
428 | cands = [k for k, v in self.state.iteritems() if v == revtodo] | |
425 | total = len(cands) |
|
429 | total = len(cands) | |
@@ -480,7 +484,8 b' class rebaseruntime(object):' | |||||
480 | p1, p2, base = defineparents(repo, rev, self.destmap, |
|
484 | p1, p2, base = defineparents(repo, rev, self.destmap, | |
481 | self.state, self.skipped, |
|
485 | self.state, self.skipped, | |
482 | self.obsoletenotrebased) |
|
486 | self.obsoletenotrebased) | |
483 | self.storestatus(tr=tr) |
|
487 | if not tr: | |
|
488 | self.storestatus() | |||
484 | if len(repo[None].parents()) == 2: |
|
489 | if len(repo[None].parents()) == 2: | |
485 | repo.ui.debug('resuming interrupted rebase\n') |
|
490 | repo.ui.debug('resuming interrupted rebase\n') | |
486 | else: |
|
491 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now