Skip to main content
Jump to: navigation, search

Difference between revisions of "OSEE/branch"

(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   
|Apple
 
|12,333.00
 
|-
 
 
|BRANCH_TYPE
 
|BRANCH_TYPE
|Pie
 
|500.00
 
|-
 
 
|BASELINE_TRANSACTION_ID
 
|BASELINE_TRANSACTION_ID
|Ice cream
+
|BRANCH_GUID
|1.00
+
|-
+
|BRANCH_GUID
+
|Ice cream
+
|1.00
+
|-
+
 
|ASSOCIATED_ART_ID
 
|ASSOCIATED_ART_ID
|Ice cream
 
|1.00
 
|-
 
 
|ARCHIVED
 
|ARCHIVED
|Ice cream
 
|1.00
 
|-
 
 
|BRANCH_ID
 
|BRANCH_ID
|Ice cream
+
|PARENT_BRANCH_ID
|1.00
+
|PARENT_TRANSACTION_ID
 
|-
 
|-
|BRANCH_STATE
+
|A
|Ice cream
+
|B
|1.00
+
|C
 +
|D
 +
|E
 +
|F
 +
|G
 +
|H
 +
|I
 +
|J
 
|-
 
|-
|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 17: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

Merge(s)

Conflict(s)

Back to the top