Commits

Yuya Nishihara committed bf969ce

merge: refresh csinfo of commit page so that it can show two parents

Because mergeCsInfo is instantiated before merging, commit page happens to
show stale dirstate, which has one parent.

  • Participants
  • Parent commits d28d02a
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/merge.py

                                     withupdate=True)
         mergeCsInfo.linkActivated.connect(self.onLinkActivated)
         self.layout().addWidget(mergeCsInfo)
+        self.mergeCsInfo = mergeCsInfo
 
         # commit message area
         msg_sep = qtlib.LabeledSeparator(_('Commit message'))
     def currentPage(self):
         super(CommitPage, self).currentPage()
         self.wizard().setOption(QWizard.NoDefaultButton, True)
+        self.mergeCsInfo.update()  # show post-merge state
 
         engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False)
         wctx = self.repo[None]