PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 69a2c2a..1d6f3e0 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2247,6 +2247,10 @@ BOOL CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi,
 {
        DiffFileInfo *fileInfo = NULL;
        BOOL bFileChanged = FALSE;
+       BOOL bIgnoreSmallDiff = mf->m_options.GetBool(OPT_IGNORE_SMALL_FILETIME);
+       int tolerance = 0;
+       if (bIgnoreSmallDiff)
+               tolerance = SmallTimeDiff; // From MainFrm.h
 
        if (bLeft)
        {
@@ -2265,8 +2269,9 @@ BOOL CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi,
 
        dfi.Update(szPath);
 
-       
-       if (dfi.mtime != fileInfo->mtime ||
+       int timeDiff = dfi.mtime - fileInfo->mtime;
+       timeDiff = abs(timeDiff);
+       if (timeDiff > tolerance ||
                dfi.size != fileInfo->size)
        {
                bFileChanged = TRUE;

diff --git a/Src/readme.txt b/Src/readme.txt
index 49cf8a6..bb1bf85 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,8 @@
 2005-04-25 Kimmo
  BUG: [ 1179790 ] ReadMe-Hungarian.rtf file is missing
   docs/Users/Languages new file: Read Me-Hungarian.rtf
+ PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference
+  Src: MergeDoc.cpp
 
 2005-04-24 Kimmo
  PATCH: [ 1186884 ] Restrict access to DirDoc's DiffContext