view mercurial.tex @ 357:b3bd9bc3e5f8

Remove extra slides for now
author Martin Geisler <mg@aragost.com>
date Thu, 21 Jun 2012 16:52:16 +0200
parents 3740c9e50f8c
children 5b52d58f37a3
line wrap: on
line source

\documentclass[t,noamsthm,xcolor=dvipsnames]{beamer}
\input{preambel}
\title{Distributed Version Control with Mercurial}
\author{Martin Geisler
  \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
                 {<mg@aragost.com>}}
\date{CCDC,\\Cambridge, UK\\June 25th--27th, 2012}

\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}

\subsection{Mercurial}

\include{features}
\include{mercurial-users}
%\include{openoffice}
%\include{testimonials}

\subsection{Centralized vs Distributed}

\include{centralized}
\include{distributed}
\include{why-distributed}

\subsection{Key Mercurial Concepts}

\include{pull-merge}
\include{key-commands}

\section{Using Mercurial}

\subsection{Workflows}

\include{workflow-team}
\include{workflow-divisions}
\include{workflow-yourself}

\subsection{Branches}

\include{branches}
%\include{svn-branching}
%\include{svn-merging}

\subsection{The Underlying Model}

\include{model}
\include{immutable-history}

\include{central-workflow}

\subsection{Using History}

\include{annotate}
\include{grep}
\include{bisect}

\section{Frontends}

%\include{extensions}

%\subsection{Changing History}

%\include{rebase}
%\include{mq}
%\include{histedit}

%\subsection{Talking to Other Systems}

%\include{convert}
%\include{hgsubversion}
%\include{hg-git}

%\subsection{Third-Party Tools}

\include{third-party-tools}
\include{tortoisehg}
\include{machg}
%\include{mercurialeclipse}
%\include{hgsccpackage}

%\section{Demonstration}
%\include{demo}

\section{Comparison with Git}

\include{git}
\include{git-branches}

\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