Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "OSEE/branch"
< OSEE
(→Branch) |
(→Branch) |
||
Line 8: | Line 8: | ||
[[Image:Osee_branch_intro1.png]] | [[Image:Osee_branch_intro1.png]] | ||
− | {| border="1" align="left" style="font-size: | + | {| border="1" align="left" style="font-size: 20; text-align:center;" |
|BRANCH_NAME | |BRANCH_NAME | ||
|BRANCH_TYPE | |BRANCH_TYPE |
Revision as of 19:36, 31 January 2012
This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.
To also help in understanding of a OSEE branches, sample scenario (default Demo database) will be weaved into the text.
Branch
A branch in OSEE is represented by an entry in OSEE_BRANCH table.
BRANCH_NAME | BRANCH_TYPE | BASELINE_TRANSACTION_ID | BRANCH_GUID | ASSOCIATED_ART_ID | ARCHIVED | BRANCH_ID | BRANCH_STATE | PARENT_BRANCH_ID | PARENT_TRANSACTION_ID |
System Root Branch | 4 | 1 | AyH_fDnM2RFEhyybolQA | -1 | 0 | 1 | 1 | -1 | 1 |
Common | 2 | 4 | AyH_fDpMERA+zDfML4gA | -1 | 0 | 2 | 2 | 2 | 3 |