Mercurial > hg > mercurial-talk

annotate vendor-branches.tex @ 236:47d9cd2e8431

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Beginning of vendor branches talk
author Martin Geisler <mg@aragost.com>
date Fri, 19 Nov 2010 14:42:11 +0100
parents
children 27df6bc42607
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
236
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
1 \documentclass[t,noamsthm,xcolor=dvipsnames]{beamer}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
2 \input{preambel}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
3 \title{Vendor Branches in Mercurial:\\Elegant Management of Third-Party Code}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
4 \author{Martin Geisler
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
5 \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
6 {<mg@aragost.com>}}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
7 \date{Mercurial Geek Night\\ November 24th, 2010}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
8
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
9 \begin{document}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
10
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
11 \begin{frame}[plain]
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
12 \maketitle
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
13 \begin{tikzpicture}[overlay, remember picture]
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
14 \node[above right] at (current page.south west)
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
15 {\includegraphics[height=3cm]{pixelman-front}};
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
16 \end{tikzpicture}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
17 \end{frame}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
18
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
19 \include{mg}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
20
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
21 \begin{frame}{Outline}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
22 \tableofcontents
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
23 \end{frame}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
24
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
25 \section{Introduction}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
26
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
27 \include{features}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
28 \include{mercurial-users}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
29 \include{testimonials}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
30 \include{centralized}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
31 \include{distributed}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
32 %\include{why-distributed}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
33
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
34 \include{pull-merge}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
35 \include{key-commands}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
36
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
37 \section{Using Mercurial}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
38
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
39 \subsection{Workflows}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
40
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
41 \include{workflow-team}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
42 \include{workflow-divisions}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
43 \include{workflow-yourself}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
44
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
45 \subsection{Branches}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
46
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
47 \include{branches}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
48 %\include{merging}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
49 \include{svn-branching}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
50 \include{svn-merging}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
51
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
52 \subsection{The Underlying Model}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
53
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
54 \include{model}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
55 %\include{immutable-history}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
56
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
57 %\include{central-workflow}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
58
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
59 \subsection{Using History}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
60
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
61 \include{annotate}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
62 \include{grep}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
63 \include{bisect}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
64
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
65 \section{Cool Extensions}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
66
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
67 \include{extensions}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
68
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
69 \subsection{Changing History}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
70
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
71 \include{rebase}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
72 %\include{mq}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
73 \include{histedit}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
74
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
75 \subsection{Talking to Other Systems}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
76
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
77 \include{convert}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
78 \include{hgsubversion}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
79 \include{hg-git}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
80
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
81 \subsection{Third-Party Tools}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
82
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
83 \include{third-party-tools}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
84
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
85 %\section{Demonstration}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
86 %\include{demo}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
87
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
88 \section{Wrapping Up}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
89
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
90 \include{nutshell}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
91 \include{links}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
92 \include{contact}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
93 \include{contributors}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
94
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
95 % Send mail
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
96
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
97 \end{document}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
98
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
99 % LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets