Differences From Artifact [4ba2fd38a2]:

• File src/schema.c — part of check-in [32c639d086] at 2007-08-26 06:12:08 on branch trunk — Reference to obsolete field vfile.parent removed. Fixed table reference in definition of table vfile. (user: aku size: 10057)

To Artifact [c780fb4f32]:

• File src/schema.c — part of check-in [4c82c7773f] at 2007-08-30 20:27:14 on branch trunk — 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. (user: drh size: 10079)

243
244
245
246
247
248
249
250


251
252
253
254
255
256
257

243
244
245
246
247
248
249

250
251
252
253
254
255
256
257
258

-
+
+

@ -- file tree.  If a VFILE entry with id has merged with another
@ -- record, there is an entry in this table with (id,merge) where
@ -- merge is the RECORD table entry that the file merged against.
@ -- 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[] =
@ -- A copy of the vfile table schema used by the WWW server
@ --
@ CREATE TEMP TABLE vfile(