##// END OF EJS Templates
rebase: only store collapse message once...
Martin von Zweigbergk -
r36793:6dab3bdb default
parent child Browse files
Show More
@@ -478,7 +478,6 b' class rebaseruntime(object):'
478 self.state, self.skipped,
478 self.state, self.skipped,
479 self.obsoletenotrebased)
479 self.obsoletenotrebased)
480 self.storestatus(tr=tr)
480 self.storestatus(tr=tr)
481 storecollapsemsg(repo, self.collapsemsg)
482 if len(repo[None].parents()) == 2:
481 if len(repo[None].parents()) == 2:
483 repo.ui.debug('resuming interrupted rebase\n')
482 repo.ui.debug('resuming interrupted rebase\n')
484 else:
483 else:
@@ -846,6 +845,7 b' def _origrebase(ui, repo, inmemory=False'
846 retcode = rbsrt._preparenewrebase(destmap)
845 retcode = rbsrt._preparenewrebase(destmap)
847 if retcode is not None:
846 if retcode is not None:
848 return retcode
847 return retcode
848 storecollapsemsg(repo, rbsrt.collapsemsg)
849
849
850 tr = None
850 tr = None
851
851
General Comments 0
You need to be logged in to leave comments. Login now