Differences From:

File src/schema.c part of check-in [32c639d086] - Reference to obsolete field vfile.parent removed. Fixed table reference in definition of table vfile. by aku on 2007-08-26 06:12:08. [view]

To:

File src/schema.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]

@@ -246,9 +246,10 @@
 @ -- An id of 0 here means the version record itself.
 @
 @ CREATE TABLE vmerge(
 @   id INTEGER REFERENCES vfile,      -- VFILE entry that has been merged
-@   merge INTEGER                     -- Merged with this record
+@   merge INTEGER,                    -- Merged with this record
+@   UNIQUE(id, merge)
 @ );
 ;
 
 const char zServerTempSchema[] =