Notice: this Wiki will be going read only early in 2024 and edits will no longer be 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 10: | Line 10: | ||
<pre> | <pre> | ||
------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ||
| − | |BRANCH_NAME|BRANCH_TYPE|BASELINE_TRANSACTION_ID|BRANCH_GUID|ASSOCIATED_ART_ID|ARCHIVED|BRANCH_ID|BRANCH_STATE|PARENT_BRANCH_ID|PARENT_TRANSACTION_ID| | + | |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 1 1 3 | ||
</pre> | </pre> | ||
Revision as of 19:27, 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 1 1 3
| 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 |