Fossil SCM
Clean up some old comments on the schema. No code changes.
Commit
f51856bed337383bdd20845d5ccbe2521648cd57246103fd06cd0bb2494fec93
Parent
8977dfb03295226…
1 file changed
+10
-12
+10
-12
| --- src/schema.c | ||
| +++ src/schema.c | ||
| @@ -2,11 +2,11 @@ | ||
| 2 | 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | 3 | ** |
| 4 | 4 | ** This program is free software; you can redistribute it and/or |
| 5 | 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | - | |
| 7 | +** | |
| 8 | 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | 9 | ** but without any warranty; without even the implied warranty of |
| 10 | 10 | ** merchantability or fitness for a particular purpose. |
| 11 | 11 | ** |
| 12 | 12 | ** Author contact information: |
| @@ -352,11 +352,11 @@ | ||
| 352 | 352 | @ -- |
| 353 | 353 | @ CREATE TABLE unsent( |
| 354 | 354 | @ rid INTEGER PRIMARY KEY -- Record ID of the phantom |
| 355 | 355 | @ ); |
| 356 | 356 | @ |
| 357 | -@ -- Each baseline or manifest can have one or more tags. A tag | |
| 357 | +@ -- Each artifact can have one or more tags. A tag | |
| 358 | 358 | @ -- is defined by a row in the next table. |
| 359 | 359 | @ -- |
| 360 | 360 | @ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of |
| 361 | 361 | @ -- the wiki page. Tickets changes are tagged with "ticket-UUID" where |
| 362 | 362 | @ -- UUID is the indentifier of the ticket. Tags used to assign symbolic |
| @@ -377,11 +377,11 @@ | ||
| 377 | 377 | @ INSERT INTO tag VALUES(8, 'branch'); -- TAG_BRANCH |
| 378 | 378 | @ INSERT INTO tag VALUES(9, 'closed'); -- TAG_CLOSED |
| 379 | 379 | @ INSERT INTO tag VALUES(10,'parent'); -- TAG_PARENT |
| 380 | 380 | @ INSERT INTO tag VALUES(11,'note'); -- TAG_NOTE |
| 381 | 381 | @ |
| 382 | -@ -- Assignments of tags to baselines. Note that we allow tags to | |
| 382 | +@ -- Assignments of tags to artifacts. Note that we allow tags to | |
| 383 | 383 | @ -- have values assigned to them. So we are not really dealing with |
| 384 | 384 | @ -- tags here. These are really properties. But we are going to |
| 385 | 385 | @ -- keep calling them tags because in many cases the value is ignored. |
| 386 | 386 | @ -- |
| 387 | 387 | @ CREATE TABLE tagxref( |
| @@ -515,22 +515,20 @@ | ||
| 515 | 515 | @ -- current checkout. |
| 516 | 516 | @ -- |
| 517 | 517 | @ -- The file.rid field is 0 for files or folders that have been |
| 518 | 518 | @ -- added but not yet committed. |
| 519 | 519 | @ -- |
| 520 | -@ -- Vfile.chnged is 0 for unmodified files, 1 for files that have | |
| 521 | -@ -- been edited or which have been subjected to a 3-way merge. | |
| 522 | -@ -- Vfile.chnged is 2 if the file has been replaced from a different | |
| 523 | -@ -- version by the merge and 3 if the file has been added by a merge. | |
| 524 | -@ -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been | |
| 525 | -@ -- done by an --integrate merge. The difference between vfile.chnged==3|5 | |
| 526 | -@ -- and a regular add is that with vfile.chnged==3|5 we know that the | |
| 527 | -@ -- current version of the file is already in the repository. | |
| 520 | +@ -- Vfile.chnged meaning: | |
| 521 | +@ -- 0 File is unmodified | |
| 522 | +@ -- 1 Manually edited and/or modified as part of a merge command | |
| 523 | +@ -- 2 Replaced by a merge command | |
| 524 | +@ -- 3 Added by a merge command | |
| 525 | +@ -- 4,5 Same as 2,3 except merge using --integrate | |
| 528 | 526 | @ -- |
| 529 | 527 | @ CREATE TABLE vfile( |
| 530 | 528 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 531 | -@ vid INTEGER REFERENCES blob, -- The baseline this file is part of. | |
| 529 | +@ vid INTEGER REFERENCES blob, -- The checkin this file is part of. | |
| 532 | 530 | @ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add |
| 533 | 531 | @ deleted BOOLEAN DEFAULT 0, -- True if deleted |
| 534 | 532 | @ isexe BOOLEAN, -- True if file should be executable |
| 535 | 533 | @ islink BOOLEAN, -- True if file should be symlink |
| 536 | 534 | @ rid INTEGER, -- Originally from this repository record |
| 537 | 535 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -2,11 +2,11 @@ | |
| 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | ** |
| 4 | ** This program is free software; you can redistribute it and/or |
| 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | |
| 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | ** but without any warranty; without even the implied warranty of |
| 10 | ** merchantability or fitness for a particular purpose. |
| 11 | ** |
| 12 | ** Author contact information: |
| @@ -352,11 +352,11 @@ | |
| 352 | @ -- |
| 353 | @ CREATE TABLE unsent( |
| 354 | @ rid INTEGER PRIMARY KEY -- Record ID of the phantom |
| 355 | @ ); |
| 356 | @ |
| 357 | @ -- Each baseline or manifest can have one or more tags. A tag |
| 358 | @ -- is defined by a row in the next table. |
| 359 | @ -- |
| 360 | @ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of |
| 361 | @ -- the wiki page. Tickets changes are tagged with "ticket-UUID" where |
| 362 | @ -- UUID is the indentifier of the ticket. Tags used to assign symbolic |
| @@ -377,11 +377,11 @@ | |
| 377 | @ INSERT INTO tag VALUES(8, 'branch'); -- TAG_BRANCH |
| 378 | @ INSERT INTO tag VALUES(9, 'closed'); -- TAG_CLOSED |
| 379 | @ INSERT INTO tag VALUES(10,'parent'); -- TAG_PARENT |
| 380 | @ INSERT INTO tag VALUES(11,'note'); -- TAG_NOTE |
| 381 | @ |
| 382 | @ -- Assignments of tags to baselines. Note that we allow tags to |
| 383 | @ -- have values assigned to them. So we are not really dealing with |
| 384 | @ -- tags here. These are really properties. But we are going to |
| 385 | @ -- keep calling them tags because in many cases the value is ignored. |
| 386 | @ -- |
| 387 | @ CREATE TABLE tagxref( |
| @@ -515,22 +515,20 @@ | |
| 515 | @ -- current checkout. |
| 516 | @ -- |
| 517 | @ -- The file.rid field is 0 for files or folders that have been |
| 518 | @ -- added but not yet committed. |
| 519 | @ -- |
| 520 | @ -- Vfile.chnged is 0 for unmodified files, 1 for files that have |
| 521 | @ -- been edited or which have been subjected to a 3-way merge. |
| 522 | @ -- Vfile.chnged is 2 if the file has been replaced from a different |
| 523 | @ -- version by the merge and 3 if the file has been added by a merge. |
| 524 | @ -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been |
| 525 | @ -- done by an --integrate merge. The difference between vfile.chnged==3|5 |
| 526 | @ -- and a regular add is that with vfile.chnged==3|5 we know that the |
| 527 | @ -- current version of the file is already in the repository. |
| 528 | @ -- |
| 529 | @ CREATE TABLE vfile( |
| 530 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 531 | @ vid INTEGER REFERENCES blob, -- The baseline this file is part of. |
| 532 | @ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add |
| 533 | @ deleted BOOLEAN DEFAULT 0, -- True if deleted |
| 534 | @ isexe BOOLEAN, -- True if file should be executable |
| 535 | @ islink BOOLEAN, -- True if file should be symlink |
| 536 | @ rid INTEGER, -- Originally from this repository record |
| 537 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -2,11 +2,11 @@ | |
| 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | ** |
| 4 | ** This program is free software; you can redistribute it and/or |
| 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | ** |
| 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | ** but without any warranty; without even the implied warranty of |
| 10 | ** merchantability or fitness for a particular purpose. |
| 11 | ** |
| 12 | ** Author contact information: |
| @@ -352,11 +352,11 @@ | |
| 352 | @ -- |
| 353 | @ CREATE TABLE unsent( |
| 354 | @ rid INTEGER PRIMARY KEY -- Record ID of the phantom |
| 355 | @ ); |
| 356 | @ |
| 357 | @ -- Each artifact can have one or more tags. A tag |
| 358 | @ -- is defined by a row in the next table. |
| 359 | @ -- |
| 360 | @ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of |
| 361 | @ -- the wiki page. Tickets changes are tagged with "ticket-UUID" where |
| 362 | @ -- UUID is the indentifier of the ticket. Tags used to assign symbolic |
| @@ -377,11 +377,11 @@ | |
| 377 | @ INSERT INTO tag VALUES(8, 'branch'); -- TAG_BRANCH |
| 378 | @ INSERT INTO tag VALUES(9, 'closed'); -- TAG_CLOSED |
| 379 | @ INSERT INTO tag VALUES(10,'parent'); -- TAG_PARENT |
| 380 | @ INSERT INTO tag VALUES(11,'note'); -- TAG_NOTE |
| 381 | @ |
| 382 | @ -- Assignments of tags to artifacts. Note that we allow tags to |
| 383 | @ -- have values assigned to them. So we are not really dealing with |
| 384 | @ -- tags here. These are really properties. But we are going to |
| 385 | @ -- keep calling them tags because in many cases the value is ignored. |
| 386 | @ -- |
| 387 | @ CREATE TABLE tagxref( |
| @@ -515,22 +515,20 @@ | |
| 515 | @ -- current checkout. |
| 516 | @ -- |
| 517 | @ -- The file.rid field is 0 for files or folders that have been |
| 518 | @ -- added but not yet committed. |
| 519 | @ -- |
| 520 | @ -- Vfile.chnged meaning: |
| 521 | @ -- 0 File is unmodified |
| 522 | @ -- 1 Manually edited and/or modified as part of a merge command |
| 523 | @ -- 2 Replaced by a merge command |
| 524 | @ -- 3 Added by a merge command |
| 525 | @ -- 4,5 Same as 2,3 except merge using --integrate |
| 526 | @ -- |
| 527 | @ CREATE TABLE vfile( |
| 528 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 529 | @ vid INTEGER REFERENCES blob, -- The checkin this file is part of. |
| 530 | @ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add |
| 531 | @ deleted BOOLEAN DEFAULT 0, -- True if deleted |
| 532 | @ isexe BOOLEAN, -- True if file should be executable |
| 533 | @ islink BOOLEAN, -- True if file should be symlink |
| 534 | @ rid INTEGER, -- Originally from this repository record |
| 535 |