[meld/meld-1-8] dirdiff: Fix "Same" filter for shallow comparison cases (bgo#730346)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-1-8] dirdiff: Fix "Same" filter for shallow comparison cases (bgo#730346)
- Date: Fri, 23 May 2014 21:25:02 +0000 (UTC)
commit 3f048da3563bdad5ee06d7603d0a2da22f2f7449
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 63d32e7..2524bb5 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1174,7 +1174,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 _files_same(curfiles, regexes, self.prefs) in (Same, SameFiltered):
+ if _files_same(curfiles, regexes, self.prefs) 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]