Mercurial > hg > mercurial-talk

changeset 134:161a763421b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bitbucket workflow.
author Martin Geisler <mg@aragost.com>
date Wed, 24 Mar 2010 12:28:53 +0100
parents d0b68c1124f7
children a79063c492c1
files mercurial.tex
diffstat 1 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial.tex
+++ b/mercurial.tex
@@ -413,7 +413,7 @@
 \end{frame}
 
 \begin{frame}{Workflow Between Company Divisions}
-  \dots to working in a world-wide setting:
+  \dots to working in a world-wide setting\dots:
   \begin{center}
     \begin{tikzpicture}[node distance=8mm]
       \tikzstyle{repository}+=[minimum height=18mm, text width=12mm]
@@ -449,6 +449,24 @@
   \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}
 
 \begin{frame}{Branches in SVN}
   Subversion knows nothing about branches!