# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1394314463 18000
# Node ID 6e67194fc28322a122ac0508b383b15a0f6fcbdf
# Parent  4223c8ce1cc0e0a4d207865ccd38c6aa2e0ed93b
Finalise intro

diff -r 4223c8ce1cc0 -r 6e67194fc283 git-force-push.jpg
Binary file git-force-push.jpg has changed
diff -r 4223c8ce1cc0 -r 6e67194fc283 hg-logo.png
Binary file hg-logo.png has changed
diff -r 4223c8ce1cc0 -r 6e67194fc283 histedit.jpg
Binary file histedit.jpg has changed
diff -r 4223c8ce1cc0 -r 6e67194fc283 lol-jenkins.png
Binary file lol-jenkins.png has changed
diff -r 4223c8ce1cc0 -r 6e67194fc283 talk.tex
--- a/talk.tex	Fri Mar 07 11:04:16 2014 -0500
+++ b/talk.tex	Sat Mar 08 16:34:23 2014 -0500
@@ -1,6 +1,6 @@
 %%% BEGIN BEAMER PREAMBLE %%%
 \documentclass[green]{beamer}
-\usepackage{bm}
+\usepackage{bm, multimedia}
 
 
 
@@ -37,18 +37,16 @@
 \end{frame}
 
 \begin{frame}
-  \textbf{The problems with collaborative rewriting}
-  \begin{itemize}
-    \pause
-    \item Recovering from upstream rewrite (rebase)
-    \pause
-    \begin{quote}
-      Rebasing (or any other form of rewriting) a branch that others
-      have based work on is a bad idea: anyone downstream of it is
-      forced to manually fix their history.
-    \end{quote}
-    ... from git-rebase(7)
-  \end{itemize}
+  {\Large \textbf{Problems that Evolve is trying to solve}}
+  \pause
+  \textbf{Problem 1}: Recovering from upstream rewrite (rebase)
+  \pause
+  \begin{quote}
+    Rebasing (or any other form of rewriting) a branch that others
+    have based work on is a bad idea: anyone downstream of it is
+    forced to manually fix their history.
+  \end{quote}
+  ... from git-rebase(7)
 \end{frame}
 
 \begin{frame}
@@ -83,22 +81,48 @@
 
 \begin{frame}
   \begin{center}
-    \pgfimage[height=3in]{git-rebase}
+    \pgfimage[height=3.69in]{git-rebase}
   \end{center}
 \end{frame}
 
 
 \begin{frame}
-  \textbf{The problems with collaborative rewriting}
-  \begin{itemize}
-    \pause
-    \item When is rewriting ok, when is it a lie?
-    \pause
-    \item R
-  \end{itemize}
-  Changeset evolution to the rescue!
+  {\Large \textbf{Problems that Evolve is trying to solve}}
+  \textbf{Problem 2}: Some commits are historical record, should not be rewritten
+  \pause
+  \begin{table}
+    \pgfimage[width=4in]{histedit}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Problems that Evolve is trying to solve}}
+  \textbf{Problem 3}: Safely sharing rewritten commits with remote repos
+  \pause
+  \begin{table}
+    \pgfimage[width=4in]{lol-jenkins}
+  \end{table}
 \end{frame}
 
-
+\begin{frame}
+  \begin{table}
+    \pgfimage[height=3in]{git-force-push}
+  \end{table}
+\end{frame}
 
+\begin{frame}
+  {\Large \textbf{Problems that Evolve is trying to solve}}
+  \begin{enumerate}
+    \item Recovering from upstream rewrite (rebase)
+    \item Some commits are historical record, should not be rewritten
+    \item Safely sharing rewritten commits with remote repos
+  \end{enumerate}
+\end{frame}
+
+\begin{frame}
+  \begin{table}
+    \pgfimage[height=2in]{hg-logo}
+  \end{table}
+  Mercurial Evolve to the rescue!
+\end{frame}
 \end{document}
\ No newline at end of file