From 3bacd46cda3f36c0eb8d3b20c166fda54f88deb1 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <Thomas.klaehn@lairdtech.com>
Date: Tue, 11 Oct 2016 11:47:28 +0200
Subject: [PATCH] branching strategy for upcoming I320 moray white2 release
 refactored

---
 img_gitlab.tex | 102 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 70 insertions(+), 32 deletions(-)

diff --git a/img_gitlab.tex b/img_gitlab.tex
index 915aae6..f559301 100644
--- a/img_gitlab.tex
+++ b/img_gitlab.tex
@@ -1,9 +1,8 @@
 \psset{griddots=0,gridlabels=8pt,subgriddiv=5}
-\psset{xunit=10mm,yunit=10mm}
+\psset{xunit=13mm,yunit=13mm}
 \begin{pspicture}(14,26)
 %	\psgrid
 	\newcommand{\clr}{black}
-	% master
 	\newcommand{\masterx}{7}
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\masterx,1)(\masterx,26)
 	\psset{fillcolor=\clr}
@@ -27,7 +26,6 @@
 		\psset{framearc=.5}
 		\psframebox{\textcolor{\clr}{white2\_master}}
 	}
-	% release/.../iteration_1
 	\renewcommand{\clr}{ForestGreen}
 	\newcommand{\featurex}{3}
 	\psset{fillcolor=\clr}
@@ -43,9 +41,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{release/white2/I320/iteration\_1}}
+		\psframebox{\textcolor{\clr}{release/white2/I320/RB1}}
 	}
-	% release/.../iteration_2
 	\psset{fillcolor=\clr}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,12)(\featurex,13)
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,13)(\featurex,17)
@@ -58,9 +55,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{release/white2/I320/iteration\_2}}
+		\psframebox{\textcolor{\clr}{release/white2/I320/RB2}}
 	}
-	% release/.../iteration_3
 	\psset{fillcolor=\clr}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,18)(\featurex,19)
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,19)(\featurex,23)
@@ -73,9 +69,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{release/white2/I320/iteration\_3}}
+		\psframebox{\textcolor{\clr}{release/white2/I320/RB3}}
 	}
-	% fix/error_1
 	\renewcommand{\clr}{Maroon}
 	\newcommand{\fixx}{5}
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,3)(\fixx,4)
@@ -92,9 +87,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{fix/error\_1}}
+		\psframebox{\textcolor{\clr}{fix/white2/e\_1}}
 	}
-	% fix/error_2
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,7)(\fixx,8)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,8)(\fixx,10)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,10)(\featurex,11)
@@ -109,9 +103,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{fix/error\_2}}
+		\psframebox{\textcolor{\clr}{fix/white2/e\_2}}
 	}
-	% fix/error_3
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,13)(\fixx,14)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,14)(\fixx,16)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,16)(\featurex,17)
@@ -126,9 +119,8 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{fix/error\_3}}
+		\psframebox{\textcolor{\clr}{fix/white2/e\_3}}
 	}
-	% fix/error_4
 	\psline[linewidth=2pt,linecolor=\clr](\featurex,19)(\fixx,20)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,20)(\fixx,22)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,22)(\featurex,23)
@@ -143,26 +135,24 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{fix/error\_4}}
+		\psframebox{\textcolor{\clr}{fix/white2/e\_4}}
 	}
-	% feature/f_1
 	\renewcommand{\clr}{RoyalBlue}
 	\renewcommand{\fixx}{11}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\fixx,3)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,3)(\fixx,5)
 	\psline[linewidth=2pt,linecolor=\clr,arrowsize=15pt]{->}(\fixx,5)(\masterx,6)
 	\psline[linewidth=1pt,linecolor=\clr,linestyle=dashed](\fixx,2.5)(\fixx,5.5)
-	\rput(11.5,2){
+	\rput(12,2){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{feature/f\_1}}
+		\psframebox{\textcolor{\clr}{feature/white2/f\_1}}
 	}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,3)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,5)
-	% feature/f_2
 	\renewcommand{\fixx}{9}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,2)(\fixx,3)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,3)(\fixx,7)
@@ -173,13 +163,12 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{feature/f\_2}}
+		\psframebox{\textcolor{\clr}{feature/white2/f\_2}}
 	}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,3)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,5)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,7)
-	% feature/f_3
 	\renewcommand{\fixx}{11}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,7)(\fixx,8)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,8)(\fixx,12)
@@ -190,13 +179,12 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{feature/f\_3}}
+		\psframebox{\textcolor{\clr}{feature/white2/f\_3}}
 	}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,8)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,12)
-	% feature/f_4
 	\renewcommand{\fixx}{9}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,11)(\fixx,12)
 	\psline[linewidth=2pt,linecolor=\clr](\fixx,12)(\fixx,14)
@@ -207,12 +195,11 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{feature/f\_4}}
+		\psframebox{\textcolor{\clr}{feature/white2/f\_4}}
 	}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,12)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,14)
-	% dev_fix/error_5
 	\renewcommand{\clr}{Magenta}
 	\renewcommand{\fixx}{11}
 	\psline[linewidth=2pt,linecolor=\clr](\masterx,12)(\fixx,13)
@@ -224,12 +211,11 @@
 		\psset{fillstyle=solid}
 		\psset{linecolor=\clr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\clr}{fix/error\_5}}
+		\psframebox{\textcolor{\clr}{fix/white2/e\_5}}
 	}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,13)
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,15)
-	% external release
 	\renewcommand{\clr}{RedOrange}
 	\psset{fillcolor=\clr}
 	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,23)
@@ -240,20 +226,72 @@
 		\psset{framearc=.5}
 		\psframebox{\textcolor{\clr}{customer release}}
 	}
+	\renewcommand{\clr}{DarkOrchid}
+	\psset{fillcolor=\clr}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,3)
+	\rput(2,3){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC1}}
+	}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,11)
+	\rput(2,11){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC2}}
+	}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,13)
+	\rput(2,13){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC3}}
+	}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,17)
+	\rput(2,17){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC4}}
+	}
+	\psdot[dotsize=5pt,dotstyle=o,linecolor=\clr](3,19)
+	\rput(2,19){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC5}}
+	}
+	\rput(2,23){
+		\psset{fillcolor=white}
+		\psset{fillstyle=solid}
+		\psset{linecolor=\clr}
+		\psset{framearc=.5}
+		\psframebox{\textcolor{\clr}{RC6}}
+	}
 	\psset{linecolor=white}
 	\rput(10.5,25){
-		\psframebox{\textcolor{ForestGreen}{Release Canditates}}
+		\psframebox{\textcolor{ForestGreen}{Release branch}}
 	}
 	\rput(10.5,24.5){
-		\psframebox{\textcolor{RedOrange}{Customer release}}
+		\psframebox{\textcolor{DarkOrchid}{Release candidate}}
 	}
 	\rput(10.5,24){
-		\psframebox{\textcolor{Maroon}{Error dedected by system test}}
+		\psframebox{\textcolor{RedOrange}{Customer release}}
 	}
 	\rput(10.5,23.5){
-		\psframebox{\textcolor{Magenta}{Error detected while development}}
+		\psframebox{\textcolor{Maroon}{Error dedected by system test}}
 	}
 	\rput(10.5,23){
+		\psframebox{\textcolor{Magenta}{Error detected while development}}
+	}
+	\rput(10.5,22.5){
 		\psframebox{\textcolor{RoyalBlue}{Feature implementation}}
 	}
 \end{pspicture}