# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1340373344 -7200
# Node ID 7788b512c5bd6163810616c53d888f190c9f3f52
# Parent  33add2a99379dfbdd6c8a0a915b4a6ddbe894f0c
Trim vendor branch slides

diff --git a/mercurial-vendor-branches.tex b/mercurial-vendor-branches.tex
--- a/mercurial-vendor-branches.tex
+++ b/mercurial-vendor-branches.tex
@@ -10,8 +10,8 @@
       \tikzstyle{join-se}=[out=0, in=90]
       \tikzstyle{join-ne}=[out=90, in=180]
 
+      \node<1->[rev, join] {};
       \node<1->[left=of chain-1, anchor=west, xshift=-1cm] {default:};
-      \node<1->[rev, join] {};
       \node<1->[rev, join] (a) {};
       \node<2->[libfoo, join=with a by join-ne, above right=of a] (v1) {};
       %\draw<2->[thick] (v1.north) -- +(0, 0.2) node[tag,above] {libfoo 1.0};
diff --git a/rename-guessing.tex b/rename-guessing.tex
--- a/rename-guessing.tex
+++ b/rename-guessing.tex
@@ -4,18 +4,18 @@
 $ rm -r lib/libfoo
 $ unzip libfoo-2.0.zip -d lib/libfoo
 $ hg status
-M lib/libfoo/modified.txt
-! lib/libfoo/deleted.txt
-? lib/libfoo/new.txt
+M lib/libfoo/a.txt
+! lib/libfoo/b.txt
+? lib/libfoo/c.txt
 \end{lstlisting}
 
 \pause
 
-Question: has \ext{deleted.txt} been renamed to \ext{new.txt}?
+Question: has \ext{b.txt} been renamed to \ext{c.txt}?
 \begin{lstlisting}
 $ hg addremove --similarity 90
-removing deleted.txt
-adding new.txt
-recording removal of deleted.txt as rename to new.txt (94% similar)
+removing b.txt
+adding c.txt
+recording removal of b.txt as rename to c.txt (94% similar)
 \end{lstlisting}
 \end{frame}
diff --git a/vendor-branches.tex b/vendor-branches.tex
--- a/vendor-branches.tex
+++ b/vendor-branches.tex
@@ -4,7 +4,7 @@
 \author{Martin Geisler
   \texorpdfstring{\\$\langle$\texttt{mg@aragost.com}$\rangle$}
                  {<mg@aragost.com>}}
-\date{Mercurial Geek Night II\\ November 24th, 2010}
+\date{CCDC\\Cambridge, UK\\June 25th--27th, 2012}
 
 \begin{document}
 
@@ -16,34 +16,12 @@
   \end{tikzpicture}
 \end{frame}
 
-\include{mg}
+%\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}
@@ -51,22 +29,15 @@
 \include{library-maintenance}
 \include{library-upgrades}
 
-\subsection{Vendor Branches in Mercurial}
+\section{Vendor Branches in Mercurial}
 \include{mercurial-vendor-branches}
 \include{merge-details}
 \include{merging-vendor-branches}
 
-\subsection{Handling Renamed Files}
+\section{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