Patchwork D2712: rebase: only store collapse message once

login
register
mail settings
Submitter phabricator
Date March 7, 2018, 9:16 p.m.
Message ID <75599b98ab9614b87a2efb3b4f26de54@localhost.localdomain>
Download mbox | patch
Permalink /patch/29106/
State Not Applicable
Headers show

Comments

phabricator - March 7, 2018, 9:16 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6dab3bdb1f00: rebase: only store collapse message once (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2712?vs=6700&id=6707

REVISION DETAIL
  https://phab.mercurial-scm.org/D2712

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -478,7 +478,6 @@ 
                                              self.state, self.skipped,
                                              self.obsoletenotrebased)
                 self.storestatus(tr=tr)
-                storecollapsemsg(repo, self.collapsemsg)
                 if len(repo[None].parents()) == 2:
                     repo.ui.debug('resuming interrupted rebase\n')
                 else:
@@ -846,6 +845,7 @@ 
             retcode = rbsrt._preparenewrebase(destmap)
             if retcode is not None:
                 return retcode
+            storecollapsemsg(repo, rbsrt.collapsemsg)
 
         tr = None