Skip to main content

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.

Jump to: navigation, search

Difference between revisions of "OSEE/branch"

(Adding)
(Adding)
Line 136: Line 136:
 
|3
 
|3
 
|}
 
|}
 +
 +
<br/>
 +
<br/>
 +
<br/>
 +
<br/>
 +
<br/>
 +
<br/>
 +
<br/>
 +
<br/>
 +
  
 
OSEE_TX_DETAILS Table: (from <code>SELECT * FROM OSEE.OSEE_TX_DETAILS  WHERE TRANSACTION_ID = 24;</code>)
 
OSEE_TX_DETAILS Table: (from <code>SELECT * FROM OSEE.OSEE_TX_DETAILS  WHERE TRANSACTION_ID = 24;</code>)

Revision as of 20:20, 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.

Osee branch intro1.png

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
SAW_Bld_1 2 19 AyH_f2sSKy3l07fIvAAA -1 0 3 1 1 3
CIS_Bld_1 2 21 AyH_f2sSKy3l07fIvDDD -1 0 4 1 1 3








Adding

Creating a child branch CIS_child_branch from CIS_Bld_1.

Osee branch adding a branch.png

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
SAW_Bld_1 2 19 AyH_f2sSKy3l07fIvAAA -1 0 3 1 1 3
CIS_Bld_1 2 21 AyH_f2sSKy3l07fIvDDD -1 0 4 1 1 3










OSEE_TX_DETAILS Table: (from SELECT * FROM OSEE.OSEE_TX_DETAILS WHERE TRANSACTION_ID = 24;)

AUTHOR TIME OSEE_COMMENT TX_TYPE COMMIT_ART_ID BRANCH_ID TRANSACTION_ID
17 2012-01-31 13:30:03.865 New Branch from CIS_Bld_1 (22) 1 null 5 24









Merge(s)

Conflict(s)

Back to the top