Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

backout: add autoresolve option

Changeset 9f2251f601a8…

Parent 8fcd6e6d3006…

by James McKay

Changes to one file · Browse files at 9f2251f601a8 Showing diff from parent 8fcd6e6d3006 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​backout.py Stacked
 
71
72
73
 
 
 
 
 
 
74
75
76
 
139
140
141
142
 
 
143
144
145
 
71
72
73
74
75
76
77
78
79
80
81
82
 
145
146
147
 
148
149
150
151
152
@@ -71,6 +71,12 @@
  self.msg_text.setEnabled(False)   obox.addWidget(self.merge_chk)   + self.autoresolve_chk = QCheckBox(_('Automatically resolve merge conflicts ' + 'where possible')) + self.autoresolve_chk.setChecked( + repo.ui.configbool('tortoisehg', 'autoresolve', False)) + obox.addWidget(self.autoresolve_chk) +   self.reslabel = QLabel()   self.reslabel.linkActivated.connect(self.link_activated)   box.addWidget(self.reslabel) @@ -139,7 +145,8 @@
  # prepare command line   revhex = self.target_info.get_data('revid')   cmdline = ['backout', '--rev', revhex, '--repository', self.repo.root] - cmdline += ['--tool=internal:fail'] + cmdline += ['--tool=internal:' + + (self.autoresolve_chk.isChecked() and 'merge' or 'fail')]   if self.merge_chk.isChecked():   cmdline += ['--merge']   msg = self.msg_text.toPlainText()