Commits

Yuya Nishihara committed 6d2b804

sync: actually show rebase dialog on conflict during pull --rebase

a3462d36e386 was wrong because post-pull action is managed differently than
common options.

Comments (0)

Files changed (1)

tortoisehg/hgqt/sync.py

                                       % (link, ret))
             self.pullCompleted.emit()
             # handle file conflicts during rebase
-            if self.opts.get('rebase') or self.opts.get('updateorrebase'):
+            if self.cachedpp in ('rebase', 'updateorrebase'):
                 if os.path.exists(self.repo.join('rebasestate')):
                     dlg = rebase.RebaseDialog(self._repoagent, self)
                     dlg.exec_()