Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable update: check for unresolved conflicts recursively

Changeset 7416d9740fdc…

Parent 8f9b0cb8d2cb…

by Steve Borho

Changes to one file · Browse files at 7416d9740fdc Showing diff from parent 8f9b0cb8d2cb Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
299
300
301
302
303
304
 
 
305
306
307
 
315
316
317
318
319
320
321
 
299
300
301
 
 
 
302
303
304
305
306
 
314
315
316
 
317
318
319
@@ -299,9 +299,8 @@
  self.accept()     def accept(self): - ms = mergemod.mergestate(self.repo) - for path in ms: - if ms[path] == 'u': + for root, path, status in thgrepo.recursiveMergeStatus(self.repo): + if status == 'u':   qtlib.InfoMsgBox(_('Merge caused file conflicts'),   _('File conflicts need to be resolved'))   dlg = resolve.ResolveDialog(self.repo, self) @@ -315,7 +314,6 @@
   def run(ui, *pats, **opts):   from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   rev = None   if opts.get('rev'):