Commits

Yuya Nishihara committed 9f19325

rebase: notify user that rebase failed (closes #1610)

Based on a patch written by Michal Sznajder <michalsznajder@gmail.com>.

  • Participants
  • Parent commits f67b369
  • Branches stable

Comments (0)

Files changed (1)

tortoisehg/hgqt/rebase.py

             msg = _('Rebase is complete')
             if self.aborted:
                 msg = _('Rebase aborted')
+            elif ret == 255:
+                msg = _('Rebase failed')
+                self.cmd.setShowOutput(True)  # contains hint
             self.showMessage.emit(msg)
             self.rebasebtn.setEnabled(True)
             self.rebasebtn.setText(_('Close'))