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

stable sync: check for unresolved conflicts recursively

Changeset 29e08f1a6322…

Parent f7efbb18f909…

by Steve Borho

Changes to one file · Browse files at 29e08f1a6322 Showing diff from parent f7efbb18f909 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
684
685
686
687
688
689
 
 
690
691
692
 
1388
1389
1390
1391
1392
1393
 
684
685
686
 
 
 
687
688
689
690
691
 
1387
1388
1389
 
1390
1391
@@ -684,9 +684,8 @@
  dlg.exec_()   return   # handle file conflicts during update - 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) @@ -1388,6 +1387,5 @@
   def run(ui, *pats, **opts):   from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo   repo = thgrepo.repository(ui, path=paths.find_root())   return SyncWidget(repo, None, **opts)