Mercurial > evolve-talk
comparison talk.tex @ 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 |
comparison
equal
deleted
inserted
replaced
| 19:f55b1a32596d | 20:5eb72904e11c |
|---|---|
| 242 \item Those revision numbers skipping around? | 242 \item Those revision numbers skipping around? |
| 243 \end{itemize} | 243 \end{itemize} |
| 244 | 244 |
| 245 \end{frame} | 245 \end{frame} |
| 246 | 246 |
| 247 \begin{frame} | |
| 248 {\Large \textbf{Evolve under the hood}} | |
| 249 \begin{itemize} | |
| 250 \item All Evolve operations are \emph{append-only}. | |
| 251 \pause | |
| 252 \item Pre-edited commits stick around. They're only marked as obsolete. | |
| 253 \pause | |
| 254 \item Commits may be obsoleted by another overwriting commit. | |
| 255 \begin {itemize} | |
| 256 \item \texttt{fold} (\texttt{squash}) | |
| 257 \item \texttt{amend} | |
| 258 \end{itemize} | |
| 259 \pause | |
| 260 \item Commits may just be plain obsolete with nothing to replace them. | |
| 261 \begin{itemize} | |
| 262 \item \texttt{prune} | |
| 263 \end{itemize} | |
| 264 \pause | |
| 265 \item Evolve knows how to propagate all this info across clones! | |
| 266 \end{itemize} | |
| 267 \end{frame} | |
| 268 | |
| 269 \begin{frame} | |
| 270 {\Large \textbf{Sharing with Evolve}} | |
| 271 \begin{table} | |
| 272 \pgfimage[width=4in]{evolve-1} | |
| 273 \end{table} | |
| 274 \end{frame} | |
| 275 | |
| 276 \begin{frame} | |
| 277 {\Large \textbf{Sharing with Evolve}} | |
| 278 \begin{table} | |
| 279 \pgfimage[width=4in]{evolve-2} | |
| 280 \end{table} | |
| 281 \end{frame} | |
| 282 | |
| 283 \begin{frame} | |
| 284 {\Large \textbf{Sharing with Evolve}} | |
| 285 \begin{table} | |
| 286 \pgfimage[width=4in]{evolve-3} | |
| 287 \end{table} | |
| 288 \end{frame} | |
| 289 | |
| 290 \begin{frame} | |
| 291 {\Large \textbf{Sharing with Evolve}} | |
| 292 \begin{table} | |
| 293 \pgfimage[width=4in]{evolve-4} | |
| 294 \end{table} | |
| 295 \end{frame} | |
| 296 | |
| 297 \begin{frame} | |
| 298 {\Large \textbf{Sharing with Evolve}} | |
| 299 \begin{table} | |
| 300 \pgfimage[width=4in]{evolve-5} | |
| 301 \end{table} | |
| 302 \end{frame} | |
| 303 | |
| 304 \begin{frame} | |
| 305 {\Large \textbf{Sharing with Evolve}} | |
| 306 \begin{table} | |
| 307 \pgfimage[width=4in]{evolve-6} | |
| 308 \end{table} | |
| 309 \end{frame} | |
| 310 | |
| 311 \begin{frame} | |
| 312 {\Large \textbf{Sharing with Evolve}} | |
| 313 \begin{table} | |
| 314 \pgfimage[width=4in]{evolve-7} | |
| 315 \end{table} | |
| 316 \end{frame} | |
| 317 | |
| 247 \end{document} | 318 \end{document} |