Mercurial > hg > mercurial-talk

annotate vendor-branches.tex @ 326:4175a4edfa4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stress commercial support options, no vendor lock-in
author Martin Geisler <mg@aragost.com>
date Thu, 02 Feb 2012 12:48:49 +0100
parents 33b6c73e487e
children 7788b512c5bd
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>}}
245
65dd197a147a Fix title
Martin Geisler <mg@lazybytes.net>
parents: 244
diff changeset
7 \date{Mercurial Geek Night II\\ November 24th, 2010}
236
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{centralized}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
30 \include{distributed}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
31
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
32 \include{pull-merge}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
33 \include{key-commands}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
34
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
35 \section{Using Mercurial}
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 \subsection{Workflows}
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 \include{workflow-team}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
40 \include{workflow-divisions}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
41 \include{workflow-yourself}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
42
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
43 \subsection{Branches}
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 \include{branches}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
46
244
0c7201ecbc43 Beginning of vendor branch section
Martin Geisler <mg@aragost.com>
parents: 242
diff changeset
47 \section{Vendor Branches}
0c7201ecbc43 Beginning of vendor branch section
Martin Geisler <mg@aragost.com>
parents: 242
diff changeset
48
250
409792abdefd Describe why people bundle code
Martin Geisler <mg@lazybytes.net>
parents: 245
diff changeset
49 \include{bundled-code}
409792abdefd Describe why people bundle code
Martin Geisler <mg@lazybytes.net>
parents: 245
diff changeset
50
244
0c7201ecbc43 Beginning of vendor branch section
Martin Geisler <mg@aragost.com>
parents: 242
diff changeset
51 \include{library-maintenance}
251
f5274e700a8d Describe goal of vendor branches
Martin Geisler <mg@lazybytes.net>
parents: 250
diff changeset
52 \include{library-upgrades}
244
0c7201ecbc43 Beginning of vendor branch section
Martin Geisler <mg@aragost.com>
parents: 242
diff changeset
53
252
f73da41a4f51 Vendor branches in Mercurial
Martin Geisler <mg@lazybytes.net>
parents: 251
diff changeset
54 \subsection{Vendor Branches in Mercurial}
f73da41a4f51 Vendor branches in Mercurial
Martin Geisler <mg@lazybytes.net>
parents: 251
diff changeset
55 \include{mercurial-vendor-branches}
f73da41a4f51 Vendor branches in Mercurial
Martin Geisler <mg@lazybytes.net>
parents: 251
diff changeset
56 \include{merge-details}
f73da41a4f51 Vendor branches in Mercurial
Martin Geisler <mg@lazybytes.net>
parents: 251
diff changeset
57 \include{merging-vendor-branches}
f73da41a4f51 Vendor branches in Mercurial
Martin Geisler <mg@lazybytes.net>
parents: 251
diff changeset
58
253
6839cd949165 Handling renames
Martin Geisler <mg@lazybytes.net>
parents: 252
diff changeset
59 \subsection{Handling Renamed Files}
6839cd949165 Handling renames
Martin Geisler <mg@lazybytes.net>
parents: 252
diff changeset
60 \include{rename-guessing}
6839cd949165 Handling renames
Martin Geisler <mg@lazybytes.net>
parents: 252
diff changeset
61 \include{renames-and-merges}
6839cd949165 Handling renames
Martin Geisler <mg@lazybytes.net>
parents: 252
diff changeset
62
236
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
63 \section{Wrapping Up}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
64
254
33b6c73e487e Conclusion for vendor branches
Martin Geisler <mg@lazybytes.net>
parents: 253
diff changeset
65 \include{conclusion-branches}
236
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
66 \include{links}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
67 \include{contact}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
68 \include{contributors}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
69
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
70 \end{document}
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
71
47d9cd2e8431 Beginning of vendor branches talk
Martin Geisler <mg@aragost.com>
parents:
diff changeset
72 % LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets