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
| Line 1: | Line 1: | ||
| − | This describes OSEE branches, conflicts and merge handling. | + | This wiki describes OSEE branches, conflicts and merge handling. Target audience here is primarily developers. |
= Branch = | = Branch = | ||
| + | A branch in OSEE is represented by an entry in OSEE_BRANCH table. | ||
| + | |||
| + | {| border="1" align="center" style="text-align:center;" | ||
| + | |BRANCH_NAME | ||
| + | |Apple | ||
| + | |12,333.00 | ||
| + | |- | ||
| + | |BRANCH_TYPE | ||
| + | |Pie | ||
| + | |500.00 | ||
| + | |- | ||
| + | |BASELINE_TRANSACTION_ID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |BRANCH_GUID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |ASSOCIATED_ART_ID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |ARCHIVED | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |BRANCH_ID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |BRANCH_STATE | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |PARENT_BRANCH_ID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |- | ||
| + | |PARENT_TRANSACTION_ID | ||
| + | |Ice cream | ||
| + | |1.00 | ||
| + | |||
| + | |} | ||
| + | |||
= Merge(s) = | = Merge(s) = | ||
= Conflict(s) = | = Conflict(s) = | ||
Revision as of 18:26, 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 | Apple | 12,333.00 |
| BRANCH_TYPE | Pie | 500.00 |
| BASELINE_TRANSACTION_ID | Ice cream | 1.00 |
| BRANCH_GUID | Ice cream | 1.00 |
| ASSOCIATED_ART_ID | Ice cream | 1.00 |
| ARCHIVED | Ice cream | 1.00 |
| BRANCH_ID | Ice cream | 1.00 |
| BRANCH_STATE | Ice cream | 1.00 |
| PARENT_BRANCH_ID | Ice cream | 1.00 |
| PARENT_TRANSACTION_ID | Ice cream | 1.00 |