Mercurial > hg > mercurial-talk
view vendor-branches.tex @ 326:4175a4edfa4c
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 |
line wrap: on
line source
\documentclass[t,noamsthm,xcolor=dvipsnames]{beamer} \input{preambel} \title{Vendor Branches in Mercurial:\\Elegant Management of Third-Party Code} \author{Martin Geisler \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$} {<mg@aragost.com>}} \date{Mercurial Geek Night II\\ November 24th, 2010} \begin{document} \begin{frame}[plain] \maketitle \begin{tikzpicture}[overlay, remember picture] \node[above right] at (current page.south west) {\includegraphics[height=3cm]{pixelman-front}}; \end{tikzpicture} \end{frame} \include{mg} \begin{frame}{Outline} \tableofcontents \end{frame} \section{Introduction} \include{features} \include{mercurial-users} \include{centralized} \include{distributed} \include{pull-merge} \include{key-commands} \section{Using Mercurial} \subsection{Workflows} \include{workflow-team} \include{workflow-divisions} \include{workflow-yourself} \subsection{Branches} \include{branches} \section{Vendor Branches} \include{bundled-code} \include{library-maintenance} \include{library-upgrades} \subsection{Vendor Branches in Mercurial} \include{mercurial-vendor-branches} \include{merge-details} \include{merging-vendor-branches} \subsection{Handling Renamed Files} \include{rename-guessing} \include{renames-and-merges} \section{Wrapping Up} \include{conclusion-branches} \include{links} \include{contact} \include{contributors} \end{document} % LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets