2005-07-31 Perry

 PATCH: [ 1248180 ] fix moved block code
 BUG: [ 1248172 ] Assert failure in CDiffWrapper::RunFileDiff
 BUG: [ 1186199 ] Assert from moved block code
  Src: DiffWrapper.cpp

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 874f76b..faab43f 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -1111,12 +1111,15 @@ public:
        }
 };
 
-
 /*
  WinMerge moved block code
  This is called by diffutils code, by diff_2_files routine
  read_files earlier computed the hash chains ("equivs" file variable) and freed them,
  but the equivs numerics are still available in each line
+
+ match1 set by scan from line0 to deleted
+ match0 set by scan from line1 to inserted
+
 */
 extern "C" void moved_block_analysis(struct change ** pscript, struct file_data fd[])
 {
@@ -1360,10 +1363,11 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
                        newob->deleted = e->deleted;
                        newob->link = e->link;
                        newob->match0 = -1;
-                       newob->match1 = -1;
+                       newob->match1 = e->match1;
 
                        e->inserted -= suffix;
                        e->deleted = 0;
+                       e->match1 = -1;
                        e->link = newob;
 
                        p = newob; // next block to scan

diff --git a/Src/readme.txt b/Src/readme.txt
index 3cfd9da..44a4755 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2005-07-31 Perry
+ PATCH: [ 1248180 ] fix moved block code
+ BUG: [ 1248172 ] Assert failure in CDiffWrapper::RunFileDiff
+ BUG: [ 1186199 ] Assert from moved block code
+  Src: DiffWrapper.cpp
+
 2005-07-30 Perry
  PATCH: [ 1247483 ] Create folder if one doesn't exist (for reports and patches)
  BUG: [ 1248017 ] WinMerge\Src\DirCmpReport.cpp(80) : error C2065: 'IDS_FOLDER