Mercurial > hg > mercurial-talk
changeset 157:8f625aa11c10
Split off slides on centralized/distributed VCS.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Tue, 27 Apr 2010 09:19:16 +0200 |
| parents | 8e2b0c9522f5 |
| children | 1def7cfae69f |
| files | centralized.tex distributed.tex mercurial.tex |
| diffstat | 3 files changed, 64 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/centralized.tex @@ -0,0 +1,36 @@ +\begin{frame}{Centralized Revision Control} + Subversion uses a single server: + \begin{center} + \begin{tikzpicture} + \tikzstyle{working copy}+=[below, text width=25mm] + + \node[repository, label=above:Repository] (repository) {}; + \node[rev] (r1) at (-7mm, 0) {}; + \node[rev] (r2) at (0, 0) {}; + \node[rev] (r3) at (7mm, 0) {}; + \draw[->] (r1) -- (r2); + \draw[->] (r2) -- (r3); + + \node[working copy, label=below:Alice] (a) at (-3.5, -2.5) { + trunk/\\ + \quad hello.c\\ + \quad Makefile + }; + \node[working copy, label=below:Bob] (b) at (0, -2.5) { + branches/\\ + \quad bob/\\ + \qquad hello.c\\ + \qquad Makefile + }; + \node[working copy, label=below:Carla] (c) at (3.5, -2.5) { + trunk/\\ + \quad hello.c\\ + \quad Makefile + }; + + \draw[<->, short] (a) -- (repository); + \draw[<->, short] (b) -- (repository); + \draw[<->, short] (c) -- (repository); + \end{tikzpicture} + \end{center} +\end{frame}
new file mode 100644 --- /dev/null +++ b/distributed.tex @@ -0,0 +1,26 @@ +\begin{frame}{Distributed Revision Control} + Mercurial duplicates the history on many servers: + \begin{center} + \begin{tikzpicture}[start chain, bend angle=10] + \tikzstyle{every node}=[repository, minimum height=18mm, text width=15mm,] + \tikzstyle{every path}=[<->, short] + + \node (a) at ( 90:3) {Alice}; + \node (b) at (210:3) {Bob}; + \node (c) at (-30:3) {Carla}; + \draw<1-2> (a) -- (b); + \draw<1-2> (b) -- (c); + \draw<1-2> (c) -- (a); + + \node<2->[overlay] (l) at ([xshift=3cm] a) {Alice's Laptop}; + \draw<2-> (a) -- (l); + + \node<3-> (r) at (0, 0) {Server}; + \draw<3-> (a) -- (r); + \draw<3-> (b) to[bend left] (r); + \draw<3-> (c) to[bend right] (r); + + \draw<4-> (a) to[bend right] (b); + \end{tikzpicture} + \end{center} +\end{frame}
--- a/mercurial.tex +++ b/mercurial.tex @@ -120,69 +120,8 @@ \include{key-concepts} -\begin{frame}{Centralized Revision Control} - Subversion uses a single server: - \begin{center} - \begin{tikzpicture} - \tikzstyle{working copy}+=[below, text width=25mm] - - \node[repository, label=above:Repository] (repository) {}; - \node[rev] (r1) at (-7mm, 0) {}; - \node[rev] (r2) at (0, 0) {}; - \node[rev] (r3) at (7mm, 0) {}; - \draw[->] (r1) -- (r2); - \draw[->] (r2) -- (r3); - - \node[working copy, label=below:Alice] (a) at (-3.5, -2.5) { - trunk/\\ - \quad hello.c\\ - \quad Makefile - }; - \node[working copy, label=below:Bob] (b) at (0, -2.5) { - branches/\\ - \quad bob/\\ - \qquad hello.c\\ - \qquad Makefile - }; - \node[working copy, label=below:Carla] (c) at (3.5, -2.5) { - trunk/\\ - \quad hello.c\\ - \quad Makefile - }; - - \draw[<->, short] (a) -- (repository); - \draw[<->, short] (b) -- (repository); - \draw[<->, short] (c) -- (repository); - \end{tikzpicture} - \end{center} -\end{frame} - -\begin{frame}{Distributed Revision Control} - Mercurial duplicates the history on many servers: - \begin{center} - \begin{tikzpicture}[start chain, bend angle=10] - \tikzstyle{every node}=[repository, minimum height=18mm, text width=15mm,] - \tikzstyle{every path}=[<->, short] - - \node (a) at ( 90:3) {Alice}; - \node (b) at (210:3) {Bob}; - \node (c) at (-30:3) {Carla}; - \draw<1-2> (a) -- (b); - \draw<1-2> (b) -- (c); - \draw<1-2> (c) -- (a); - - \node<2->[overlay] (l) at ([xshift=3cm] a) {Alice's Laptop}; - \draw<2-> (a) -- (l); - - \node<3-> (r) at (0, 0) {Server}; - \draw<3-> (a) -- (r); - \draw<3-> (b) to[bend left] (r); - \draw<3-> (c) to[bend right] (r); - - \draw<4-> (a) to[bend right] (b); - \end{tikzpicture} - \end{center} -\end{frame} +\include{centralized} +\include{distributed} \include{workflow-department} \include{workflow-divisions}