Mercurial > hg > mercurial-talk
changeset 200:664ba023dbd6
Transplant branches slide from 7f2f119a584c.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 15 Sep 2010 20:15:20 +0200 |
parents | 9ffba3f42933 |
children | 460a1a57df2a |
files | branches.tex mercurial.tex |
diffstat | 2 files changed, 27 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/branches.tex +++ b/branches.tex @@ -1,29 +1,30 @@ -\begin{frame}{Branches} - A key concept: - \begin{itemize} - \item parallel lines of development - \item used to track releases - \item used to isolate disruptive changes - \end{itemize} - - \begin{tikzpicture}[start chain] - \path[use as bounding box] (-0.5, 0) rectangle (10, 2); - \tikzstyle{rev}+=[on chain, minimum size=5mm, font=\small] - \tikzset{node distance=8mm and 10mm, on grid} +\begin{frame}{Release Branches} + \begin{center} + \begin{tikzpicture}[start chain] + \path[use as bounding box] (-0.5, 0) rectangle (9, 2); + \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] (v10) {}; - \draw<2->[thick] (v10.south) -- ++(0, -0.3) node[tag] {1.0}; - \node<3->[rev, join] {}; - \node<4->[rev, join] (default) {}; + \node[rev, join] {}; + \node[rev, join] (v10) {}; + \draw<2->[thick] (v10.south) -- ++(0, -0.3) node[tag] {1.0}; + \node<3->[rev, join] {}; + \node<3->[rev, join] {}; + \node<3->[rev, join] (tip1) {}; + + \node<4->[rev, join=with v10 by join-ne, above right=of v10] (v101) {}; + \node<5->[rev, join] (v101) {}; + \draw<5->[thick] (v101.north) -- +(0, 0.2) node[tag,above] {1.0.1}; - \node<5->[rev, join=with v10, above right=of v10] (v101) {}; - \node<5->[rev, join] {}; - \node<5->[rev, join] (v101) {}; - \draw<6->[thick] (v101.north) -- +(0, 0.2) node[tag,above] {1.0.1}; + \node<6->[rev, join=with tip1, join=with v101 by join-se, right=of tip1] {}; + \node<7->[rev, join] (tip2) {}; - \node<7->[rev, join] {}; - \node<7->[rev, join] (v102) {}; - \draw<8->[thick] (v102.north) -- +(0, 0.2) node[tag,above] {1.0.2}; - \end{tikzpicture} + \node<8->[rev, join=with v101, right=24mm of v101] (v102) {}; + \draw<8->[thick] (v102.north) -- +(0, 0.2) node[tag,above] {1.0.2}; + + \node<9->[rev, join=with tip2, join=with v102 by join-se, right=of tip2] {}; + \end{tikzpicture} + \end{center} \end{frame}