Differences From:

File src/merge.c part of check-in [6607844a01] - Added options to the "timeline" CLI command. Additional help comments. by drh on 2007-08-18 11:42:24. [view]

To:

File src/merge.c part of check-in [4c82c7773f] - Fix some annoyances with "merge". This involves a schema change to the _FOSSIL_ file. Older versions will continue to work, but it would make since to "close" and "open" local source tree after updating to this version of fossil, in order to update the schema. by drh on 2007-08-30 20:27:14. [view]

@@ -236,9 +236,10 @@
     blob_reset(&p);
     blob_reset(&m);
     blob_reset(&v);
     blob_reset(&r);
-    db_multi_exec("INSERT INTO vmerge(id,merge) VALUES(%d,%d)",idv,ridm);
+    db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)",
+                  idv,ridm);
   }
   db_finalize(&q);
 
   /*
@@ -263,7 +264,7 @@
   /*
   ** Clean up the mid and pid VFILE entries.  Then commit the changes.
   */
   db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
-  db_multi_exec("INSERT INTO vmerge(id,merge) VALUES(0,%d)", mid);
+  db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid);
   db_end_transaction(0);
 }