Mercurial > hg > mercurial-talk
annotate pull-workflow.tex @ 318:d4fb0c45e2be
Add subsections
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 10 Jun 2011 10:06:50 +0200 |
| parents | 6261ca0b5704 |
| children |
| rev | line source |
|---|---|
| 176 | 1 \begin{frame}{Moving Changesets Around} |
|
174
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
2 \tikzstyle{rev}+=[on chain, minimum size=6mm, font=\small] |
| 210 | 3 \tikzstyle{a}=[rev, draw=yellow!50!black!50, bottom color=yellow!50!black!20] |
| 4 \tikzstyle{b}=[rev, draw=green!30!black!50, bottom color=green!30!black!20] | |
| 5 \tikzstyle{c}=[rev, draw=red!50!black!50, bottom color=red!50!black!20] | |
| 169 | 6 \tikzstyle{join-above}=[out=0, in=240] |
| 7 \tikzstyle{join-below}=[out=-90, in=180] | |
|
174
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
8 \tikzset{node distance=10mm and 12mm, on grid} |
| 169 | 9 |
| 210 | 10 People have read-only access (e.g., \cmd{hg serve}): |
| 169 | 11 \medskip |
| 12 | |
| 13 \begin{tikzpicture} | |
| 14 \begin{scope}[start chain=alice] | |
| 210 | 15 \node[rev,on chain,label=above:Alice] {0}; |
| 169 | 16 \begin{scope}[start branch=bob] |
|
174
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
17 \node<5->[b,on chain=going below right, join=by join-below] {$B_1$}; |
| 169 | 18 \end{scope} |
|
174
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
19 \node<2->[a,join] {$A_1$}; |
|
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
20 \node<3->[a,join] {$A_2$}; |
|
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
21 \node<6->[a,join,join=with alice/bob-end by join-above] {$A_3$}; |
| 169 | 22 \end{scope} |
| 23 | |
| 175 | 24 \begin{scope}[start chain=bob, shift={(7, 0)}] |
| 210 | 25 \node[rev,label=above:Bob] {0}; |
|
174
526e5f40124a
Better changeset labels in pull example.
Martin Geisler <mg@aragost.com>
parents:
169
diff
changeset
|
26 \node<4->[b,join] {$B_1$}; |
| 169 | 27 \end{scope} |
| 28 | |
| 210 | 29 \begin{scope}[start chain=carla, shift={(2, -3)}] |
| 30 \node[rev,label=above:Carla] {0}; | |
| 31 \begin{scope}[start branch=bob] | |
| 32 \node<9->[b,on chain=going below right, join=by join-below] {$B_1$}; | |
| 33 \end{scope} | |
| 34 \begin{scope}[start branch=alice] | |
| 35 \node<11->[a,join=by join-below,below=of carla/bob-2] {$A_1$}; | |
| 36 \node<11->[a,join] {$A_2$}; | |
| 37 \node<11->[a,join,join=with carla/bob-end by {out=0, in=120}] {$A_3$}; | |
| 38 \end{scope} | |
| 169 | 39 |
| 210 | 40 \node<7->[c,join] {$C_1$}; |
| 41 \node<8->[c,join] {$C_2$}; | |
| 42 \node<10->[c,join] {$C_3$}; | |
| 43 \node<12->[c,join, join=with carla/alice-end by {out=0, in=-90}] {$C_4$}; | |
| 169 | 44 |
| 210 | 45 \node<1-5>[fit=(alice-begin) (alice-end)] (A) {}; |
| 46 \node<6->[fit=(alice-begin) (alice-end) (alice/bob-end)] (A) {}; | |
| 47 \node[fit=(bob-begin) (bob-end)] (B) {}; | |
| 48 \node[fit=(carla-begin) (carla-end)] (C) {}; | |
| 49 | |
| 50 \tikzstyle{every path}=[->, short] | |
| 51 \draw<5> (B) -- node[below] {\cmd{pull}} (A); | |
| 52 \draw<9> (B) -- node[below right] {\cmd{pull}} (C); | |
| 53 \draw<11> (A) -- node[above right] {\cmd{pull}} (C); | |
| 54 \end{scope} | |
| 55 \end{tikzpicture} | |
| 169 | 56 \end{frame} |