Mercurial > hg > mercurial-talk

comparison vendor-branches.tex @ 363:7788b512c5bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Trim vendor branch slides
author Martin Geisler <mg@aragost.com>
date Fri, 22 Jun 2012 15:55:44 +0200
parents 33b6c73e487e
children
comparison
equal deleted inserted replaced
362:33add2a99379 363:7788b512c5bd
2 \input{preambel} 2 \input{preambel}
3 \title{Vendor Branches in Mercurial:\\Elegant Management of Third-Party Code} 3 \title{Vendor Branches in Mercurial:\\Elegant Management of Third-Party Code}
4 \author{Martin Geisler 4 \author{Martin Geisler
5 \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$} 5 \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
6 {<mg@aragost.com>}} 6 {<mg@aragost.com>}}
7 \date{Mercurial Geek Night II\\ November 24th, 2010} 7 \date{CCDC\\Cambridge, UK\\June 25th--27th, 2012}
8 8
9 \begin{document} 9 \begin{document}
10 10
11 \begin{frame}[plain] 11 \begin{frame}[plain]
12 \maketitle 12 \maketitle
14 \node[above right] at (current page.south west) 14 \node[above right] at (current page.south west)
15 {\includegraphics[height=3cm]{pixelman-front}}; 15 {\includegraphics[height=3cm]{pixelman-front}};
16 \end{tikzpicture} 16 \end{tikzpicture}
17 \end{frame} 17 \end{frame}
18 18
19 \include{mg} 19 %\include{mg}
20 20
21 \begin{frame}{Outline} 21 \begin{frame}{Outline}
22 \tableofcontents 22 \tableofcontents
23 \end{frame} 23 \end{frame}
24
25 \section{Introduction}
26
27 \include{features}
28 \include{mercurial-users}
29 \include{centralized}
30 \include{distributed}
31
32 \include{pull-merge}
33 \include{key-commands}
34
35 \section{Using Mercurial}
36
37 \subsection{Workflows}
38
39 \include{workflow-team}
40 \include{workflow-divisions}
41 \include{workflow-yourself}
42
43 \subsection{Branches}
44
45 \include{branches}
46 24
47 \section{Vendor Branches} 25 \section{Vendor Branches}
48 26
49 \include{bundled-code} 27 \include{bundled-code}
50 28
51 \include{library-maintenance} 29 \include{library-maintenance}
52 \include{library-upgrades} 30 \include{library-upgrades}
53 31
54 \subsection{Vendor Branches in Mercurial} 32 \section{Vendor Branches in Mercurial}
55 \include{mercurial-vendor-branches} 33 \include{mercurial-vendor-branches}
56 \include{merge-details} 34 \include{merge-details}
57 \include{merging-vendor-branches} 35 \include{merging-vendor-branches}
58 36
59 \subsection{Handling Renamed Files} 37 \section{Handling Renamed Files}
60 \include{rename-guessing} 38 \include{rename-guessing}
61 \include{renames-and-merges} 39 \include{renames-and-merges}
62
63 \section{Wrapping Up}
64
65 \include{conclusion-branches}
66 \include{links}
67 \include{contact}
68 \include{contributors}
69 40
70 \end{document} 41 \end{document}
71 42
72 % LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets 43 % LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets