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

stable compress: check for unresolved conflicts recursively

Changeset 8f9b0cb8d2cb…

Parent 29e08f1a6322…

by Steve Borho

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

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​compress.py Stacked
 
14
15
16
17
 
18
19
20
 
88
89
90
91
92
93
94
 
 
95
96
97
 
14
15
16
 
17
18
19
20
 
88
89
90
 
 
 
 
91
92
93
94
95
@@ -14,7 +14,7 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt import qtlib, csinfo, cmdui, commit +from tortoisehg.hgqt import qtlib, csinfo, cmdui, commit, thgrepo    BB = QDialogButtonBox   @@ -88,10 +88,8 @@
  elif wctx.dirty():   self.dirty = True   else: - ms = mergemod.mergestate(repo) - unresolved = False - for path in ms: - if ms[path] == 'u': + for root, path, status in thgrepo.recursiveMergeStatus(repo): + if status == 'u':   self.dirty = True   break   def completed():