# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1394406128 14400
# Node ID 5eb72904e11c85b860d2300e586e06392748c8dd
# Parent  f55b1a32596d3c5c8b342776cb19247d7e6313d1
Add explanation of how Evolve pushes stuff around

diff -r f55b1a32596d -r 5eb72904e11c evolve-1.dia
Binary file evolve-1.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-1.png
Binary file evolve-1.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-2.dia
Binary file evolve-2.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-2.png
Binary file evolve-2.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-3.dia
Binary file evolve-3.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-3.png
Binary file evolve-3.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-4.dia
Binary file evolve-4.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-4.png
Binary file evolve-4.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-5.dia
Binary file evolve-5.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-5.png
Binary file evolve-5.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-6.dia
Binary file evolve-6.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-6.png
Binary file evolve-6.png has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-7.dia
Binary file evolve-7.dia has changed
diff -r f55b1a32596d -r 5eb72904e11c evolve-7.png
Binary file evolve-7.png has changed
diff -r f55b1a32596d -r 5eb72904e11c talk.tex
--- a/talk.tex	Sun Mar 09 19:01:45 2014 -0400
+++ b/talk.tex	Sun Mar 09 19:02:08 2014 -0400
@@ -244,4 +244,75 @@
 
 \end{frame}
 
+\begin{frame}
+  {\Large \textbf{Evolve under the hood}}
+  \begin{itemize}
+    \item All Evolve operations are \emph{append-only}.
+    \pause
+    \item Pre-edited commits stick around. They're only marked as obsolete.
+    \pause
+    \item Commits may be obsoleted by another overwriting commit.
+    \begin {itemize}
+      \item \texttt{fold} (\texttt{squash})
+      \item \texttt{amend}
+    \end{itemize}
+    \pause
+    \item Commits may just be plain obsolete with nothing to replace them.
+    \begin{itemize}
+      \item \texttt{prune}
+    \end{itemize}
+    \pause
+    \item Evolve knows how to propagate all this info across clones!
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-1}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-2}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-3}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-4}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-5}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-6}
+  \end{table}
+\end{frame}
+
+\begin{frame}
+  {\Large \textbf{Sharing with Evolve}}
+  \begin{table}
+    \pgfimage[width=4in]{evolve-7}
+  \end{table}
+\end{frame}
+
 \end{document}
\ No newline at end of file