From 0dadfe325333052a5d708f92471ca45615a2c63a Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <Thomas.Klaehn@novero.com>
Date: Thu, 28 Apr 2016 17:55:10 +0200
Subject: [PATCH] wip

---
 content.tex     | 30 +++++++++++++++++++++---------
 img_history.tex | 14 ++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/content.tex b/content.tex
index 9b7833d..42714f4 100644
--- a/content.tex
+++ b/content.tex
@@ -100,7 +100,6 @@ constant high code quality, the ci system is used for various tasks:
 
 \subsection{Internal release deployment} \label{sec:ci_int}
 
-\FloatBarrier
 \begin{figure}
 	\begin{center}
 		\input{img_deploy.tex}
@@ -139,6 +138,27 @@ The project specific naming convention for Agricola ruby is:\\
 	\item Deploy the release to the project's release deploy location
 \end{enumerate}
 
+\subsection{Release note generation} \label{sec:rel_note}
+
+\begin{figure}
+	\begin{center}
+		\input{img_history.tex}
+		\caption{Git commit history}
+		\label{fig:git_commit_history}
+	\end{center}
+\end{figure}
+
+To generate release notes by commit messages special tagged commit messages
+are used. Release notes are generated for release candidats and releases.
+For release candidats (internal releases) more tags are analyzed. The
+definition of the commit tag rules are somewhere in the Polarion :) Because
+the release notes content is taken from the log history of a release branch
+each commit in it's history has to use tagged commits. As long as the
+release branch is branched off the master only it's own commits and the
+master's commits has to be tagged. Figure \ref{fig:git_commit_history}
+illustrates the flow of the log history of the release branch shown in
+figure \ref{fig:gitlab_workflow}.
+
 \subsection{Configuring the build jobs} \label{sec:ci_conf}
 
 The configuration of gitlab-ci is made in the \texttt{.gitlab-ci.yml} file
@@ -173,11 +193,3 @@ variables:
 \textbf{Remember}, it is a good idea to change these values before creating
 the release branch, creating (and pushing) the branch triggers the build of
 a release candidate.
-
-\begin{figure}
-	\begin{center}
-		\input{img_history.tex}
-		\caption{Git commit history}
-		\label{fig:git_commit_history}
-	\end{center}
-\end{figure}
diff --git a/img_history.tex b/img_history.tex
index 6e35882..7830be6 100644
--- a/img_history.tex
+++ b/img_history.tex
@@ -3,7 +3,9 @@
 \begin{pspicture}(14,16)
 %	\psgrid
 	\newcommand{\clr}{Gray}
-	\newcommand{\hclr}{RedOrange}
+	\newcommand{\bclr}{RedOrange}
+	\newcommand{\hclr}{Blue}
+	\newcommand{\mclr}{black}
 
 	% master
 	\newcommand{\masterx}{7}
@@ -17,9 +19,9 @@
 	\rput(\masterx,0.5){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
-		\psset{linecolor=\hclr}
+		\psset{linecolor=\mclr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\hclr}{master}}
+		\psframebox{\textcolor{\mclr}{master}}
 	}
 	% feature/anti_osc
 	\newcommand{\featurex}{5}
@@ -55,15 +57,15 @@
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\clr](\fixx,10)
 	% release/NAR_C0
 	\renewcommand{\fixx}{5}
+	\psline[linewidth=1pt,linecolor=\bclr,linestyle=dashed](\fixx,8)(\fixx,14)
 	\psline[linewidth=2pt,linecolor=\hclr](\masterx,8)(\fixx,9)
 	\psline[linewidth=2pt,linecolor=\hclr](\fixx,9)(\fixx,13)
-	\psline[linewidth=1pt,linecolor=\hclr,linestyle=dashed](\fixx,8)(\fixx,14)
 	\rput(\fixx,14.5){
 		\psset{fillcolor=white}
 		\psset{fillstyle=solid}
-		\psset{linecolor=\hclr}
+		\psset{linecolor=\bclr}
 		\psset{framearc=.5}
-		\psframebox{\textcolor{\hclr}{release/NAR\_C0}}
+		\psframebox{\textcolor{\bclr}{release/NAR\_C0}}
 	}
 	\psset{fillcolor=\hclr}
 	\psdot[dotsize=10pt,dotstyle=o,linecolor=\hclr](\fixx,9)