Mercurial > hg > easyhg-kdiff3

changeset 50:8c9752066f09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Error-detection for diff-problems improved.
author joachim99
date Fri, 17 Oct 2003 16:54:25 +0000
parents f2d44f9d268d
children c59d5a3a8ff3
files kdiff3/src/pdiff.cpp
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/pdiff.cpp	Thu Oct 16 15:55:32 2003 +0000
+++ b/kdiff3/src/pdiff.cpp	Fri Oct 17 16:54:25 2003 +0000
@@ -17,6 +17,9 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.3  2003/10/17 16:54:25  joachim99
+ * Error-detection for diff-problems improved.
+ *
  * Revision 1.2  2003/10/11 12:50:38  joachim99
  * KDiff3App::slotRefresh(): Call setFont() for subwindows
  *
@@ -263,6 +266,10 @@
             if ( currentLine1 == size1 && currentLine2 == size2 )
                bSuccess = true;
          }
+         else
+         {
+            bSuccess = size1==size2;
+         }
       }
       if ( currentLine1==0 && currentLine2==0 )
       {
@@ -270,9 +277,6 @@
          diffList.push_back(d);
       }
 
-      FileAccess::removeFile( fileName1 );
-      FileAccess::removeFile( fileName2 );
-      FileAccess::removeFile( fileNameOut );
       g_pProgressDialog->setSubCurrent(1.0);
 
       if ( !bSuccess )
@@ -284,6 +288,10 @@
             i18n("KDiff3 Warning"));
          m_pOptionDialog->m_bUseExternalDiff = false;
       }
+      
+      FileAccess::removeFile( fileName1 );
+      FileAccess::removeFile( fileName2 );
+      FileAccess::removeFile( fileNameOut );
    }
 
    if ( ! m_pOptionDialog->m_bUseExternalDiff )