Mercurial > hg > mercurial-talk
changeset 319:f230d3e2e203
Short talk leading up to a live demo
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Thu, 06 Oct 2011 18:03:42 +0200 |
parents | d4fb0c45e2be |
children | 89dd1a91e52b |
files | demo-talk.tex |
diffstat | 1 files changed, 101 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/demo-talk.tex @@ -0,0 +1,101 @@ +\documentclass[t,noamsthm,xcolor=dvipsnames]{beamer} +\input{preambel} +\title{Modern Revision Control with Mercurial} +\author{Martin Geisler + \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$} + {<mg@aragost.com>}} +\date{GOTO Aarhus\\Mercurial User Group Event\\October 11th, 2011} + +\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{Centralized vs Distributed} + +\include{centralized} +\include{distributed} +\include{why-distributed} + +\section{Mercurial} + +\include{features} +\include{mercurial-users} +%\include{openoffice} +%\include{testimonials} + +%\subsection{Key Mercurial Concepts} + +\include{pull-merge} +\include{key-commands} + +\section{Workflows} + +\include{workflow-team} +\include{workflow-divisions} +\include{workflow-yourself} + +\section{Demostration} + +\include{demo} + +\section{Wrapping Up} + +\include{nutshell} +\include{links} +\include{contact} +\include{contributors} + +\appendix +\newcounter{finalframe} +\setcounter{finalframe}{\value{framenumber}} + +\section{Performance Study: OpenOffice} + +\include{openoffice} + +\section{Subversion and Branches} + +\include{svn-branching} +\include{svn-merging} + +\section{The Underlying Model} + +\include{model} +\include{immutable-history} + +\section{Using History} + +\include{annotate} +\include{grep} +\include{bisect} + +\section{Changing History} + +\include{rebase} +\include{mq} +\include{histedit} + +\section{Talking to Other Systems} + +\include{convert} +\include{hgsubversion} +\include{hg-git} + + +\setcounter{framenumber}{\value{finalframe}} + +\end{document} + +% LocalWords: SVN Makefile RCS CVS changeset changesets Changeset Changesets