| author | kwilk | 2012-02-03 15:08:04 (EST) |
|---|---|---|
| committer | Ryan D. Brooks | 2012-02-03 15:08:04 (EST) |
| commit | 19a40bc0bc6a59c9871e8fe3a70beb2de947cbd9 (patch) (side-by-side diff) | |
| tree | 5900860e8ef3b52c78352ec0bcbe257741ca1e84 | |
| parent | 02ed14a249ebafc4ea8f53b54f047c05e31476dd (diff) | |
| download | org.eclipse.osee-19a40bc0bc6a59c9871e8fe3a70beb2de947cbd9.zip org.eclipse.osee-19a40bc0bc6a59c9871e8fe3a70beb2de947cbd9.tar.gz org.eclipse.osee-19a40bc0bc6a59c9871e8fe3a70beb2de947cbd9.tar.bz2 | |
refinement: Improve schema documentation
| -rw-r--r-- | plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml b/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml index 32f7f81..0c39834 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml +++ b/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml @@ -390,11 +390,12 @@ </Table> <TableDescription referenceTable="OSEE_MERGE"> - <Note purpose="Core table describing merge branches"/> - <Column id="SOURCE_BRANCH_ID" description="" /> - <Column id="DEST_BRANCH_ID" description="" /> - <Column id="MERGE_BRANCH_ID" description="" /> - <Column id="COMMIT_TRANSACTION_ID" description="" /> + <Note purpose="Core table describing merge branches, these entries stay around because it is currently the only way to view merges. + Please refer to http://wiki.eclipse.org/osee/branch for a developer guide on OSEE branches."/> + <Column id="SOURCE_BRANCH_ID" description="branch being committed, 'working branch' " /> + <Column id="DEST_BRANCH_ID" description="branch being committed into, most commonly parent branch of source." /> + <Column id="MERGE_BRANCH_ID" description="self-explanatory" /> + <Column id="COMMIT_TRANSACTION_ID" description="if the merge branch has been already commited" /> </TableDescription> <Table name="OSEE_CONFLICT" schema="OSEE" tablespace="osee_data"> |