view mercurial.tex @ 207:15da3ea8fc43

Partial transplant from 7f2f119a584c.
author Martin Geisler <mg@lazybytes.net>
date Thu, 16 Sep 2010 01:11:30 +0200
parents 4e1d9656a351
children 0fb94c72b531
line wrap: on
line source

\documentclass[t,noamsthm,xcolor=dvipsnames]{beamer}
\usepackage[english]{babel}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{pxfonts}

\usepackage{listings}
\lstdefinelanguage{hgshell}{
  moredelim=[l][\bfseries]{\%},
  moredelim=[il][\bfseries\color{red}]{|red>},
}
\lstset{
  language=hgshell,
  basicstyle=\footnotesize\ttfamily,
  columns=fixed,
  showstringspaces=false,
  frame=single,
  framerule=0.4pt,
  rulecolor=\color{white!50!black},
  %backgroundcolor=\color{white},
}

\usepackage{tikz}
\usetikzlibrary{chains,positioning,shapes,fit}
\pgfdeclarelayer{background}
\pgfdeclarelayer{foreground}
\pgfsetlayers{background,main,foreground}

\tikzstyle{branch}=[blue!60, ->, >=latex, line join=round]
\tikzstyle{tag}=[below, thick, draw=yellow!50!orange, fill=yellow!50]
\tikzstyle{timeline}=[thick, ->]
\tikzstyle{rev}=[rounded corners=1pt, minimum size=3mm,
  draw=blue!50!black!50, top color=white, bottom color=blue!50!black!20]
\tikzstyle{repository}=[cylinder,shape border rotate=90, draw=structure,
  shade, left color=structure!50, right color=structure!50,
  middle color=structure!10, aspect=0.15, minimum height=20mm,
  text width=20mm, text centered]
\tikzstyle{working copy}=[rounded corners, text width=15mm, inner sep=5pt,
  draw=yellow!40!red,
  top color=yellow!10!white,
  bottom color=yellow!20!white]
\tikzstyle{invisible}=[draw,opacity=0]
\tikzstyle{highlight}=[draw=structure, thick, inner sep=6pt, rounded corners]
\tikzstyle{short}=[shorten <=3pt, shorten >=3pt]
\tikzstyle{every join}=[->]
\tikzstyle{join-nw}=[out=90, in=180]
\tikzstyle{join-sw}=[out=-90, in=180]
\tikzstyle{join-es}=[out=0, in=-90]

\mode<presentation>{
  \usefonttheme{structuresmallcapsserif}
  \setbeamercolor{structure}{fg=green!30!black}
  \setbeamertemplate{navigation symbols}{}
  \setbeamertemplate{footline}[frame number]
  \setbeamertemplate{background}{
    \begin{tikzpicture}<0->[overlay, remember picture]
      \node at (current page.center) {
        \includegraphics[height=0.9\textheight]{hg-droplets}
      };
      \ifnum\thepage>1
      \fill[white,opacity=0.95] (current page.north west)
                      rectangle (current page.south east);

      \usebeamercolor{page number in head/foot}
      \node[above right, color=fg, font=\tiny] at (current page.south west)
           {\includegraphics[height=2cm]{pixelman} aragost Trifork};
      \else
      \fill[white,opacity=0.8] (current page.north west)
                      rectangle (current page.south east);
      \fi
    \end{tikzpicture}
  }
}
\mode<handout>{
  \usepackage{pgfpages}
  \pgfpagesuselayout{4 on 1}[a4paper,landscape,border shrink=5mm]
}

\AtBeginSection[]{
  \begin{frame}<beamer>{Outline}
    \tableofcontents[currentsection]
  \end{frame}
}

\AtBeginSubsection[]{
  \begin{frame}<beamer>{Outline}
    \tableofcontents[currentsubsection]
  \end{frame}
}

\title{Fast, Flexible and Fun:\\ Revision Control with Mercurial}
\author{Martin Geisler
  \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
                 {<mg@aragost.com>}}
\date{IBM Research -- Zurich\\ September 16th, 2010}

\newcommand{\cmd}[1]{\texttt{\color{green!40!black}#1}}
\newcommand{\ext}[1]{\texttt{\color{orange!50!red}#1}}
\newcommand{\curl}[1]{\textcolor{CornflowerBlue!60!black}{\url{#1}}}

\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{why-distributed}
\include{testimonials}
\include{mercurial-users}

\include{key-concepts}
\include{key-commands}
\include{pull-workflow}

\section{Using Mercurial}

\subsection{Workflows}

\include{distributed}
\include{workflow-team}
\include{workflow-divisions}
\include{workflow-yourself}
%\include{centralized}

\subsection{Branches}

\include{branches}
%\include{merging}
\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{Cool Extensions}

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

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

\section{Wrapping Up}

\include{nutshell}
\include{links}
\include{contact}
\include{contributors}

% Send mail

\end{document}

% LocalWords:  SVN Makefile RCS CVS changeset changesets Changeset Changesets