# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1394323935 18000
# Node ID 7072c39785c97705145dfd5928a4bdd7bc459c9b
# Parent  627f34ce7c58cd5c359362c98080157af04a4d50
Basic evolve commands

diff -r 627f34ce7c58 -r 7072c39785c9 talk.tex
--- a/talk.tex	Sat Mar 08 19:06:04 2014 -0500
+++ b/talk.tex	Sat Mar 08 19:12:15 2014 -0500
@@ -125,4 +125,88 @@
   \end{table}
   Mercurial Evolve to the rescue!
 \end{frame}
+
+\begin{frame}
+  {\Large \textbf{Evolve basics}}
+  When you enable Evolve, you get a few extra commands:
+
+  \begin{columns}
+    \column{0.3 \textwidth}
+    \begin{itemize}
+      \item \texttt{amend}
+      \item \texttt{fold}
+      \item \texttt{gdown}
+      \item \texttt{gup}
+      \item \texttt{prune}
+      \item \texttt{uncommit}
+    \end{itemize}
+    \pause
+    \column{0.7 \textwidth}
+    \begin{itemize}
+      \item \texttt{hg commit -{}-amend}
+      \item can be done with \texttt{hg histedit}
+      \item \texttt{hg update -r 'parents()'}
+      \item \texttt{hg update -r 'children()'}
+      \item \texttt{hg strip}
+      \item \texttt{hg strip -{}-keep}
+    \end{itemize}
+  \end{columns}
+  \begin{center}
+    {\large These are very scriptable!}
+  \end{center}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Evolve basics}}
+  For reference, these are the rough git equivalents:
+  \begin{columns}
+    \column{0.3 \textwidth}
+    \begin{itemize}
+      \item \texttt{amend}
+      \item \texttt{fold}
+      \item \texttt{gdown}
+      \item \texttt{gup}
+      \item \texttt{prune}
+      \item \texttt{uncommit}
+    \end{itemize}
+    \column{0.7 \textwidth}
+    \begin{itemize}
+      \item \texttt{git commit -{}-amend}
+      \item can be done with \texttt{git rebase -i}
+      \item \texttt{git checkout HEAD\^}
+      \item Nothing simple, must use log or reflog
+      \item \texttt{git reset -{}-hard HEAD\^}
+      \item \texttt{git reset -{}-soft HEAD\^}
+    \end{itemize}
+  \end{columns}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Evolve's core}}
+  There's also a shiny, new command that does magic:
+  \begin{center}
+    {\Large \texttt{hg evolve}}
+  \end{center}
+  \begin{table}
+    \pgfimage[height=2in]{logo-evolve}
+  \end{table}
+  \begin{center}
+    \begin{itemize}
+      \pause
+      \item
+      Basically, automatically fixes any problems
+      \item
+      Rebases back to upstream and more!
+    \end{itemize}
+  \end{center}
+\end{frame}
+
+\begin{frame}
+  \begin{center}
+    Let's see evolve in action!
+
+    \fontsize{68}{80}\selectfont \lefthand
+  \end{center}
+\end{frame}
+
 \end{document}
\ No newline at end of file