Mercurial > evolve-talk
changeset 14:e99a93596676
Add a slide and example showcasing phases
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sun, 09 Mar 2014 11:33:42 -0400 |
parents | c48ed0e2ab41 |
children | 1c59bbe16b18 |
files | basic-session talk.tex |
diffstat | 2 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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!