hgext/rebase.py

--- a/hgext/rebase.py	Tue Mar 06 09:39:24 2018 -0800
+++ b/hgext/rebase.py	Tue Mar 06 14:29:20 2018 -0800
@@ -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