Mercurial > evolve-talk
changeset 20:5eb72904e11c
Add explanation of how Evolve pushes stuff around
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sun, 09 Mar 2014 19:02:08 -0400 |
parents | f55b1a32596d |
children | 86607675e0a8 |
files | evolve-1.dia evolve-1.png evolve-2.dia evolve-2.png evolve-3.dia evolve-3.png evolve-4.dia evolve-4.png evolve-5.dia evolve-5.png evolve-6.dia evolve-6.png evolve-7.dia evolve-7.png talk.tex |
diffstat | 15 files changed, 71 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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