Mercurial > hg > mercurial-talk

annotate model.tex @ 234:7462a94bed01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop small caps
author Martin Geisler <mg@aragost.com>
date Mon, 15 Nov 2010 14:46:50 +0100
parents 460a1a57df2a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
158
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
1 \begin{frame}{The Underlying Model}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
2 A Mercurial changeset conceptually consist of:
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
3 \begin{itemize}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
4 \item 0--2 parent changeset IDs:
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
5 \begin{itemize}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
6 \item root changeset has no parents
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
7 \item normal changesets have one parent
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
8 \item merge changesets have two parents
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
9 \end{itemize}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
10 \item date, username, commit message
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
11 \item difference from first parent changeset
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
12 \item changeset ID is computed as SHA-1 hash of the above
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
13 \item makes it impossible to inject \alert{malicious code} on server
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
14 \end{itemize}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
15
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
16 \begin{center}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
17 \begin{tikzpicture}[start chain]
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
18 \tikzstyle{rev}+=[on chain, minimum size=5mm, font=\small]
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
19 \tikzset{node distance=8mm and 10mm, on grid}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
20
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
21 \node[rev,join] {};
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
22 \node[rev,join] {};
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
23 \node[rev,join] (x) {};
201
460a1a57df2a Curved arrows all over the place.
Martin Geisler <mg@lazybytes.net>
parents: 158
diff changeset
24 \node[rev,join=by join-nw, above right=of x] (y) {};
158
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
25 \node[rev,join] (a) {};
201
460a1a57df2a Curved arrows all over the place.
Martin Geisler <mg@lazybytes.net>
parents: 158
diff changeset
26 \node[rev,join=with x by join-sw, below right=of x] (z) {};
158
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
27 \node[rev,join] {};
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
28 \node[rev,join] {};
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
29 \node[rev,join] (w) {};
201
460a1a57df2a Curved arrows all over the place.
Martin Geisler <mg@lazybytes.net>
parents: 158
diff changeset
30 \node[rev,join=by join-es, above right=of w] (b) {};
158
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
31 \node[rev,join] {};
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
32 \draw[->] (a) to[out=0, in=150] (b);
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
33 \end{tikzpicture}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
34 \end{center}
1def7cfae69f Split off slides on underlying history model.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
35 \end{frame}