Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc2, 0.4rc3, and 0.4rc4

hggtk/commit: skip confirmation on committing merges

Changeset 6bcc04ed89e1…

Parent 611be9228485…

by TK Soh

Changes to one file · Browse files at 6bcc04ed89e1 Showing diff from parent 611be9228485 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
218
219
220
221
222
223
224
225
 
 
 
226
227
228
 
218
219
220
 
 
 
 
 
221
222
223
224
225
226
@@ -218,11 +218,9 @@
  return True     if len(self.repo.workingctx().parents()) > 1: - msg = 'The repo contains merges, you must commit all files.\n\n' \ - 'Proceed with commit?' - response = Confirm('Commit Merges', [], self, msg).run() - if response == gtk.RESPONSE_YES: - self._hg_commit([]) + # as of Mercurial 1.0, merges must be committed without + # specifying file list. + self._hg_commit([])   else:   commitable = 'MAR'   addremove_list = self._relevant_files('?!')