Skip to main content
Jump to: navigation, search

Difference between revisions of "OSEE/branch"

(Adding)
Line 80: Line 80:
  
 
OSEE_BRANCH Table:
 
OSEE_BRANCH Table:
 
+
{| border="1" align="left" style="font-size: 0.7em; text-align:center;"
 +
|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
 +
|}
 
= Merge(s) =
 
= Merge(s) =
  
 
= Conflict(s) =
 
= Conflict(s) =

Revision as of 19:12, 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

Merge(s)

Conflict(s)

Back to the top