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) |
|||
| Line 6: | Line 6: | ||
{| border="1" align="center" style="text-align:center;" | {| border="1" align="center" style="text-align:center;" | ||
|BRANCH_NAME | |BRANCH_NAME | ||
| − | |||
| − | |||
| − | |||
|BRANCH_TYPE | |BRANCH_TYPE | ||
| − | |||
| − | |||
| − | |||
|BASELINE_TRANSACTION_ID | |BASELINE_TRANSACTION_ID | ||
| − | + | |BRANCH_GUID | |
| − | + | ||
| − | + | ||
| − | |BRANCH_GUID | + | |
| − | + | ||
| − | + | ||
| − | + | ||
|ASSOCIATED_ART_ID | |ASSOCIATED_ART_ID | ||
| − | |||
| − | |||
| − | |||
|ARCHIVED | |ARCHIVED | ||
| − | |||
| − | |||
| − | |||
|BRANCH_ID | |BRANCH_ID | ||
| − | | | + | |PARENT_BRANCH_ID |
| − | | | + | |PARENT_TRANSACTION_ID |
|- | |- | ||
| − | | | + | |A |
| − | | | + | |B |
| − | | | + | |C |
| + | |D | ||
| + | |E | ||
| + | |F | ||
| + | |G | ||
| + | |H | ||
| + | |I | ||
| + | |J | ||
|- | |- | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
|} | |} | ||
| − | |||
= Merge(s) = | = Merge(s) = | ||
= Conflict(s) = | = Conflict(s) = | ||
Revision as of 18:30, 31 January 2012
This wiki describes OSEE branches, conflicts and merge handling. Target audience here is primarily developers.
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 | PARENT_BRANCH_ID | PARENT_TRANSACTION_ID | |
| A | B | C | D | E | F | G | H | I | J |