changeset 331:740a2df58401

Mention named branches
author Martin Geisler <mg@aragost.com>
date Thu, 02 Feb 2012 14:45:43 +0100
parents f6b3bad87fa3
children e3d5bff7553a
files branches.tex preambel.tex
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/branches.tex
+++ b/branches.tex
@@ -1,13 +1,13 @@
 \begin{frame}{Release Branches}
-  \begin{center}
     \begin{tikzpicture}[start chain]
-      \path[use as bounding box] (-0.5, 0) rectangle (9, 2);
+      \path (0, 2) -- (0, -1); % ensure constant height
       \tikzstyle{rev}+=[on chain, minimum size=5mm]
       \tikzset{node distance=10mm and 12mm, on grid}
       \tikzstyle{join-se}=[out=0, in=150]
       \tikzstyle{join-ne}=[out=90, in=180]
 
-      \node[rev, join] {};
+      \node[rev, join] (start) {};
+      \node[left=of start] {\branch{default}:};
       \node[rev, join] (v10) {};
       \draw<2->[thick] (v10.south) -- ++(0, -0.3) node[tag] {1.0};
       \node<3->[rev, join] {};
@@ -15,6 +15,7 @@
       \node<3->[rev, join] (tip1) {};
 
       \node<4->[rev, join=with v10 by join-ne, above right=of v10] (v101) {};
+      \node<4->[above left=of start] {\branch{1.0.x}:};
       \node<5->[rev, join] (v101) {};
       \draw<5->[thick] (v101.north) -- +(0, 0.2) node[tag,above] {1.0.1};
 
@@ -26,5 +27,13 @@
 
       \node<9->[rev, join=with tip2, join=with v102 by join-se, right=of tip2] {};
     \end{tikzpicture}
-  \end{center}
+
+  \onslide<10->
+
+  Named branches:
+  \begin{itemize}
+  \item heavy-weight branches, integral part of each changeset
+  \item allow tracking and auditing of old history
+  \end{itemize}
+
 \end{frame}
--- a/preambel.tex
+++ b/preambel.tex
@@ -98,4 +98,5 @@
 
 \newcommand{\cmd}[1]{\texttt{\color{green!40!black}#1}}
 \newcommand{\ext}[1]{\texttt{\color{orange!50!red}#1}}
+\newcommand{\branch}[1]{\color{blue!50!black}#1}
 \newcommand{\curl}[1]{\textcolor{CornflowerBlue!60!black}{\url{#1}}}