# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1394379222 14400
# Node ID e99a93596676564129d073da3d9308006718890a
# Parent  c48ed0e2ab410b445d3c04d83b40631307fba318
Add a slide and example showcasing phases

diff -r c48ed0e2ab41 -r e99a93596676 basic-session
--- a/basic-session	Sun Mar 09 11:32:46 2014 -0400
+++ b/basic-session	Sun Mar 09 11:33:42 2014 -0400
@@ -43,4 +43,10 @@
 hg evolve --all
 hg log -G
 
+# What if we try to drop an old commit?
+hg prune -r upstream
+
+# Let's go back to where we were
+hg next
+
 !RET
\ No newline at end of file
diff -r c48ed0e2ab41 -r e99a93596676 talk.tex
--- a/talk.tex	Sun Mar 09 11:32:46 2014 -0400
+++ b/talk.tex	Sun Mar 09 11:33:42 2014 -0400
@@ -202,6 +202,21 @@
 \end{frame}
 
 \begin{frame}
+  {\Large \textbf{Immutable history}}
+  What about things that are set in stone?
+  \begin{table}
+    \pgfimage[width=4in]{set-in-stone}
+  \end{table}
+  \pause
+  Evolve knows how to work with phases! (solves Problem 2)
+  \pause
+  \begin{itemize}
+    \item public (immutable)
+    \item draft (editable)
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
   \begin{center}
     Let's see evolve in action!