Mercurial > hg > mercurial-talk
changeset 148:a87067630dca
Split off slides on workflows.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Mon, 26 Apr 2010 17:00:47 +0200 |
| parents | d8531d8b4c08 |
| children | 90fc2363399a |
| files | mercurial.tex workflow-department.tex workflow-divisions.tex workflow-yourself.tex |
| diffstat | 4 files changed, 78 insertions(+), 77 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial.tex +++ b/mercurial.tex @@ -280,83 +280,9 @@ \end{center} \end{frame} -\begin{frame}{Workflow in a Department} - Mercurial scales from a single department\dots: - \begin{center} - \begin{tikzpicture} - \tikzstyle{every node}=[repository, minimum height=18mm, text width=12mm] - \tikzstyle{every path}=[<->, short] - - \node (a) at (120:2) {Alice}; - \node (b) at (240:2) {Bob}; - \node (c) at ( 0:2) {Carla}; - - \node[right=of c] (t) {Test}; - \node[right=of t] (p) {Prod}; - - \draw[short, <->] (a) -- (c); - \draw[short, <->] (b) -- (c); - \draw[short, <->] (c) -- (t); - \draw[short, <->] (t) -- (p); - \end{tikzpicture} - \end{center} -\end{frame} - -\begin{frame}{Workflow Between Company Divisions} - \dots to working in a world-wide setting\dots: - \begin{center} - \begin{tikzpicture}[node distance=8mm] - \tikzstyle{repository}+=[minimum height=18mm, text width=12mm] - \tikzstyle{every path}=[<->, short] - - \node[repository, label=below:Poland] (a) at (0, 0) {}; - \node[repository, label=below:Switzerland] (b) at (3, 2) {}; - \node[repository, label=below:India] (c) at (6, 0) {}; - - \tikzstyle{repository}+=[minimum height=8mm, text width=5mm] - \node[repository, left=of a] (a1) {}; - \node[repository, above left=of a] (a2) {}; - \node[repository, below left=of a] (a3) {}; - - \node[repository, above left=of b] (b1) {}; - \node[repository, above=of b] (b2) {}; - \node[repository, above right=of b] (b3) {}; - - \node[repository, above right=of c] (c1) {}; - \node[repository, right=of c] (c2) {}; - \node[repository, below right=of c] (c3) {}; - - \draw[short, <->] (a) -- (b); - \draw[short, <->] (b) -- (c); - \draw[short, <->] (c) -- (a); - - \foreach \x in {a, b, c} { - \foreach \y in {1, 2, 3} { - \draw[short, <->] (\x\y) -- (\x); - } - } - \end{tikzpicture} - \end{center} -\end{frame} - -\begin{frame}{Workflow Between Two Computers} - \dots to working with yourself: - \begin{center} - \begin{tikzpicture} - \tikzstyle{repository}+=[minimum height=18mm, text width=15mm] - \tikzstyle{bitbucket}=[draw, thick, fill=blue!20!white, cloud, - cloud puffs=9, aspect=2] - \tikzstyle{every path}=[<->, short] - - \node[repository] (a1) at (-2cm, 0cm) {Alice's Desktop}; - \node[repository] (a2) at ( 2cm, 0cm) {Alice's Laptop}; - \node[bitbucket] (b) at (0cm, 4cm) {bitbucket.org}; - - \draw[short, <->] (a1) -- (b); - \draw[short, <->] (a2) -- (b); - \end{tikzpicture} - \end{center} -\end{frame} +\include{workflow-department} +\include{workflow-divisions} +\include{workflow-yourself} \begin{frame}{Branches in SVN} Subversion knows nothing about branches!
new file mode 100644 --- /dev/null +++ b/workflow-department.tex @@ -0,0 +1,21 @@ +\begin{frame}{Workflow in a Department} + Mercurial scales from a single department\dots: + \begin{center} + \begin{tikzpicture} + \tikzstyle{every node}=[repository, minimum height=18mm, text width=12mm] + \tikzstyle{every path}=[<->, short] + + \node (a) at (120:2) {Alice}; + \node (b) at (240:2) {Bob}; + \node (c) at ( 0:2) {Carla}; + + \node[right=of c] (t) {Test}; + \node[right=of t] (p) {Prod}; + + \draw[short, <->] (a) -- (c); + \draw[short, <->] (b) -- (c); + \draw[short, <->] (c) -- (t); + \draw[short, <->] (t) -- (p); + \end{tikzpicture} + \end{center} +\end{frame}
new file mode 100644 --- /dev/null +++ b/workflow-divisions.tex @@ -0,0 +1,36 @@ +\begin{frame}{Workflow Between Company Divisions} + \dots to working in a world-wide setting\dots: + \begin{center} + \begin{tikzpicture}[node distance=8mm] + \tikzstyle{repository}+=[minimum height=18mm, text width=12mm] + \tikzstyle{every path}=[<->, short] + + \node[repository, label=below:Poland] (a) at (0, 0) {}; + \node[repository, label=below:Switzerland] (b) at (3, 2) {}; + \node[repository, label=below:India] (c) at (6, 0) {}; + + \tikzstyle{repository}+=[minimum height=8mm, text width=5mm] + \node[repository, left=of a] (a1) {}; + \node[repository, above left=of a] (a2) {}; + \node[repository, below left=of a] (a3) {}; + + \node[repository, above left=of b] (b1) {}; + \node[repository, above=of b] (b2) {}; + \node[repository, above right=of b] (b3) {}; + + \node[repository, above right=of c] (c1) {}; + \node[repository, right=of c] (c2) {}; + \node[repository, below right=of c] (c3) {}; + + \draw[short, <->] (a) -- (b); + \draw[short, <->] (b) -- (c); + \draw[short, <->] (c) -- (a); + + \foreach \x in {a, b, c} { + \foreach \y in {1, 2, 3} { + \draw[short, <->] (\x\y) -- (\x); + } + } + \end{tikzpicture} + \end{center} +\end{frame}
new file mode 100644 --- /dev/null +++ b/workflow-yourself.tex @@ -0,0 +1,18 @@ +\begin{frame}{Workflow Between Two Computers} + \dots to working with yourself: + \begin{center} + \begin{tikzpicture} + \tikzstyle{repository}+=[minimum height=18mm, text width=15mm] + \tikzstyle{bitbucket}=[draw, thick, fill=blue!20!white, cloud, + cloud puffs=9, aspect=2] + \tikzstyle{every path}=[<->, short] + + \node[repository] (a1) at (-2cm, 0cm) {Alice's Desktop}; + \node[repository] (a2) at ( 2cm, 0cm) {Alice's Laptop}; + \node[bitbucket] (b) at (0cm, 4cm) {bitbucket.org}; + + \draw[short, <->] (a1) -- (b); + \draw[short, <->] (a2) -- (b); + \end{tikzpicture} + \end{center} +\end{frame}