Skip to main content
Jump to: navigation, search

Difference between revisions of "OSEE/branch"

Line 1: Line 1:
 
This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.  
 
This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.  
  
To also help in understanding of a sample scenario (default Demo database) will be discussed.
+
To also help in understanding of a OSEE branches, sample scenario (default Demo database) will be weaved into the text.
 
+
[[Image:Osee_branch_intro1.png]]
+
  
 
= Branch =
 
= Branch =
 
A branch in OSEE is represented by an entry in OSEE_BRANCH table.
 
A branch in OSEE is represented by an entry in OSEE_BRANCH table.
 +
 +
[[Image:Osee_branch_intro1.png]]
  
 
{| border="1" align="left" style="text-align:center;"
 
{| border="1" align="left" style="text-align:center;"
Line 30: Line 30:
 
| -1
 
| -1
 
|1
 
|1
 +
|-
 +
|Common
 +
|2
 +
|4
 +
|AyH_fDpMERA+zDfML4gA
 +
| -1
 +
|0
 +
|2
 +
|2
 +
|2
 +
|3
 
|-
 
|-
 
|}
 
|}

Revision as of 18:25, 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

Merge(s)

Conflict(s)

Back to the top