Mercurial > evolve-talk

annotate talk.tex @ 20:5eb72904e11c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
1 %%% BEGIN BEAMER PREAMBLE %%%
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
2 \documentclass[green]{beamer}
5
627f34ce7c58 Update used packages
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 3
diff changeset
3 \usepackage{bm, fourier, anyfontsize}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
4
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
5
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
6
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
7 \mode<presentation>
7
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
8 {
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
9 \usetheme{boxes}
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
10 \usecolortheme{crane}
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
11 }
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
12 \beamertemplatenavigationsymbolsempty
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
13
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
14 \usepackage{times}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
15 %%% END BEAMER PREAMBLE %%%
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
16
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
17
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
18
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
19
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
20 %%% BEGIN METADATA %%%
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
21
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
22 \author{Jordi G. H. $\langle$jordigh@octave.org$\rangle$ \\
7
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
23 ~ \\
edc5ae89b6ea Reindent stuff
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 6
diff changeset
24 hg clone http://hg.octave.org/evolve-talk}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
25
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
26
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
27 \title{Changeset Evolution in Mercurial}
17
c657209f840b Minor rewordings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 16
diff changeset
28 \subtitle{Edit commits as a team!}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
29 \date{}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
30
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
31 %%% END METADATA%%%
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
32
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
33 \begin{document}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
34
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
35 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
36 \titlepage
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
37 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
38
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
39 \begin{frame}
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
40 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
41 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
42 \textbf{Problem 1}: Recovering from upstream rewrite (rebase)
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
43 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
44 \begin{quote}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
45 Rebasing (or any other form of rewriting) a branch that others
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
46 have based work on is a bad idea: anyone downstream of it is
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
47 forced to manually fix their history.
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
48 \end{quote}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
49 ... from git-rebase(7)
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
50 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
51
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
52 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
53 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
54 \pgfimage[height=3in]{rebase1}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
55 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
56 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
57
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
58 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
59 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
60 \pgfimage[height=3in]{rebase2}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
61 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
62 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
63
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
64 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
65 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
66 \pgfimage[height=3in]{ohcrap}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
67 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
68 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
69
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
70 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
71 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
72 \pgfimage[height=3in]{rebase3}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
73 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
74 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
75
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
76 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
77 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
78 \pgfimage[height=3in]{rebase4}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
79 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
80 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
81
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
82 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
83 \begin{center}
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
84 \pgfimage[height=3.69in]{git-rebase}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
85 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
86 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
87
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
88
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
89 \begin{frame}
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
90 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
91 \textbf{Problem 2}: Some commits are historical record, should not be rewritten
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
92 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
93 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
94 \pgfimage[width=4in]{histedit}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
95 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
96 \end{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
97
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
98 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
99 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
100 \textbf{Problem 3}: Safely sharing rewritten commits with remote repos
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
101 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
102 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
103 \pgfimage[width=4in]{lol-jenkins}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
104 \end{table}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
105 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
106
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
107 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
108 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
109 \pgfimage[height=3in]{git-force-push}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
110 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
111 \end{frame}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
112
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
113 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
114 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
115 \begin{enumerate}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
116 \item Recovering from upstream rewrite (rebase)
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
117 \item Some commits are historical record, should not be rewritten
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
118 \item Safely sharing rewritten commits with remote repos
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
119 \end{enumerate}
19
f55b1a32596d Mention how Evolve's goal is also a clean UI
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 17
diff changeset
120 \pause
f55b1a32596d Mention how Evolve's goal is also a clean UI
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 17
diff changeset
121 Evolve provides a clean, consistent UI to solve these problems.
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
122 \end{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
123
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
124 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
125 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
126 \pgfimage[height=2in]{hg-logo}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
127 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
128 Mercurial Evolve to the rescue!
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
129 \end{frame}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
130
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
131 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
132 {\Large \textbf{Evolve basics}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
133 When you enable Evolve, you get a few extra commands:
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
134
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
135 \begin{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
136 \column{0.3 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
137 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
138 \item \texttt{amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
139 \item \texttt{fold}
13
c48ed0e2ab41 Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 7
diff changeset
140 \item \texttt{previous}
c48ed0e2ab41 Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 7
diff changeset
141 \item \texttt{next}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
142 \item \texttt{prune}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
143 \item \texttt{uncommit}
15
1c59bbe16b18 Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14
diff changeset
144 \item \texttt{restore}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
145 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
146 \pause
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
147 \column{0.7 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
148 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
149 \item \texttt{hg commit -{}-amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
150 \item can be done with \texttt{hg histedit}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
151 \item \texttt{hg update -r 'parents()'}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
152 \item \texttt{hg update -r 'children()'}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
153 \item \texttt{hg strip}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
154 \item \texttt{hg strip -{}-keep}
15
1c59bbe16b18 Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14
diff changeset
155 \item \texttt{hg unbundle strip-backup/...}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
156 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
157 \end{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
158 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
159 {\large These are very scriptable!}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
160 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
161 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
162
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
163 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
164 {\Large \textbf{Evolve basics}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
165 For reference, these are the rough git equivalents:
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
166 \begin{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
167 \column{0.3 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
168 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
169 \item \texttt{amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
170 \item \texttt{fold}
13
c48ed0e2ab41 Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 7
diff changeset
171 \item \texttt{previous}
c48ed0e2ab41 Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 7
diff changeset
172 \item \texttt{next}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
173 \item \texttt{prune}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
174 \item \texttt{uncommit}
15
1c59bbe16b18 Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14
diff changeset
175 \item \texttt{restore}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
176 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
177 \column{0.7 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
178 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
179 \item \texttt{git commit -{}-amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
180 \item can be done with \texttt{git rebase -i}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
181 \item \texttt{git checkout HEAD\^}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
182 \item Nothing simple, must use log or reflog
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
183 \item \texttt{git reset -{}-hard HEAD\^}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
184 \item \texttt{git reset -{}-soft HEAD\^}
15
1c59bbe16b18 Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14
diff changeset
185 \item Nothing simple, must use reflog
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
186 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
187 \end{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
188 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
189
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
190 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
191 {\Large \textbf{Evolve's core}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
192 There's also a shiny, new command that does magic:
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
193 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
194 {\Large \texttt{hg evolve}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
195 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
196 \begin{table}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
197 \pgfimage[height=2in]{logo-evolve}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
198 \end{table}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
199 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
200 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
201 \pause
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
202 \item
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
203 Basically, automatically fixes any problems
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
204 \item
17
c657209f840b Minor rewordings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 16
diff changeset
205 recovers from upstream rebase (solves Problem 1)
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
206 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
207 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
208 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
209
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
210 \begin{frame}
14
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
211 {\Large \textbf{Immutable history}}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
212 What about things that are set in stone?
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
213 \begin{table}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
214 \pgfimage[width=4in]{set-in-stone}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
215 \end{table}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
216 \pause
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
217 Evolve knows how to work with phases! (solves Problem 2)
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
218 \pause
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
219 \begin{itemize}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
220 \item public (immutable)
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
221 \item draft (editable)
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
222 \end{itemize}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
223 \end{frame}
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
224
e99a93596676 Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13
diff changeset
225 \begin{frame}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
226 \begin{center}
17
c657209f840b Minor rewordings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 16
diff changeset
227 Let's see Evolve in action!
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
228
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
229 \fontsize{68}{80}\selectfont \lefthand
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
230 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
231 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
232
16
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
233 \begin{frame}
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
234 {\Large \textbf{What about Problem 3? (sharing safely)}}
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
235
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
236 So far we've been doing this alone, but...
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
237
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
238 \begin{itemize}
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
239 \pause
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
240 \item What about sharing with others?
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
241 \pause
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
242 \item Those revision numbers skipping around?
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
243 \end{itemize}
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
244
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
245 \end{frame}
389af285236f New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15
diff changeset
246
20
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
247 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
248 {\Large \textbf{Evolve under the hood}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
249 \begin{itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
250 \item All Evolve operations are \emph{append-only}.
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
251 \pause
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
252 \item Pre-edited commits stick around. They're only marked as obsolete.
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
253 \pause
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
254 \item Commits may be obsoleted by another overwriting commit.
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
255 \begin {itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
256 \item \texttt{fold} (\texttt{squash})
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
257 \item \texttt{amend}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
258 \end{itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
259 \pause
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
260 \item Commits may just be plain obsolete with nothing to replace them.
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
261 \begin{itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
262 \item \texttt{prune}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
263 \end{itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
264 \pause
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
265 \item Evolve knows how to propagate all this info across clones!
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
266 \end{itemize}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
267 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
268
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
269 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
270 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
271 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
272 \pgfimage[width=4in]{evolve-1}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
273 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
274 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
275
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
276 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
277 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
278 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
279 \pgfimage[width=4in]{evolve-2}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
280 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
281 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
282
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
283 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
284 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
285 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
286 \pgfimage[width=4in]{evolve-3}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
287 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
288 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
289
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
290 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
291 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
292 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
293 \pgfimage[width=4in]{evolve-4}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
294 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
295 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
296
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
297 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
298 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
299 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
300 \pgfimage[width=4in]{evolve-5}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
301 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
302 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
303
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
304 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
305 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
306 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
307 \pgfimage[width=4in]{evolve-6}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
308 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
309 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
310
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
311 \begin{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
312 {\Large \textbf{Sharing with Evolve}}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
313 \begin{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
314 \pgfimage[width=4in]{evolve-7}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
315 \end{table}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
316 \end{frame}
5eb72904e11c Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19
diff changeset
317
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
318 \end{document}