[Zope-Checkins] CVS: Zope2 - MergeTemplate.c:1.1.2.3

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv25517

Modified Files:
      Tag: Catalog-BTrees-Integration
	MergeTemplate.c 
Log Message:
Fixed typo that led to copying data in second changed series that
should have been deleted.



--- Updated File MergeTemplate.c in package Zope2 --
--- MergeTemplate.c	2001/03/14 14:56:59	1.1.2.2
+++ MergeTemplate.c	2001/03/14 21:08:47	1.1.2.3
@@ -206,7 +206,7 @@
         {                       /* Both keys changed */
           cmp23=TEST_KEY(i2.key, i3.key);
           if (cmp23==0)
-            {                   /* dualing inserts */
+            {                   /* dualing inserts or deletes */
               merge_error(i1.position, i2.position, i3.position, 4);
               goto err;
             }
@@ -267,7 +267,7 @@
       else if (cmp12==0 && (set || TEST_VALUE(i1.value, i2.value) == 0))
         {                       /* delete i3 */
           if (i1.next(&i1) < 0) goto err;
-          if (i2.next(&i3) < 0) goto err;
+          if (i2.next(&i2) < 0) goto err;
         }
       else
         {                       /* Dualing deletes or delete and change */