[meld] dirdiff: Fix "Same" filter for shallow comparison cases (bgo#730346)



commit 17fd2a16ac012ac52e31aae960ab3bf1e7f1a87e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 24 07:18:56 2014 +1000

    dirdiff: Fix "Same" filter for shallow comparison cases (bgo#730346)

 meld/dirdiff.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 82380f4..f08ca94 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1212,7 +1212,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
             is_present = [ os.path.exists( f ) for f in curfiles ]
             all_present = 0 not in is_present
             if all_present:
-                if self.file_compare(curfiles, regexes) in (Same, SameFiltered):
+                if self.file_compare(curfiles, regexes) in (
+                        Same, SameFiltered, DodgySame):
                     state = tree.STATE_NORMAL
                 else:
                     state = tree.STATE_MODIFIED


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]