Mercurial > evolve-talk
annotate talk.tex @ 32:e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Tue, 11 Mar 2014 17:02:45 -0400 |
parents | f42eee738337 |
children | 7fb4764757b1 |
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 | 8 { |
9 \usetheme{boxes} | |
10 \usecolortheme{crane} | |
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 | 23 ~ \\ |
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 | 40 {\Large \textbf{Problems that Evolve is trying to solve}} |
41 \pause | |
42 \textbf{Problem 1}: Recovering from upstream rewrite (rebase) | |
43 \pause | |
44 \begin{quote} | |
45 Rebasing (or any other form of rewriting) a branch that others | |
46 have based work on is a bad idea: anyone downstream of it is | |
47 forced to manually fix their history. | |
48 \end{quote} | |
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 | 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 | 90 {\Large \textbf{Problems that Evolve is trying to solve}} |
91 \textbf{Problem 2}: Some commits are historical record, should not be rewritten | |
92 \pause | |
93 \begin{table} | |
94 \pgfimage[width=4in]{histedit} | |
95 \end{table} | |
96 \end{frame} | |
97 | |
98 \begin{frame} | |
99 {\Large \textbf{Problems that Evolve is trying to solve}} | |
100 \textbf{Problem 3}: Safely sharing rewritten commits with remote repos | |
101 \pause | |
102 \begin{table} | |
103 \pgfimage[width=4in]{lol-jenkins} | |
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 | 107 \begin{frame} |
108 \begin{table} | |
109 \pgfimage[height=3in]{git-force-push} | |
110 \end{table} | |
111 \end{frame} | |
1
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
112 |
2 | 113 \begin{frame} |
114 {\Large \textbf{Problems that Evolve is trying to solve}} | |
115 \begin{enumerate} | |
116 \item Recovering from upstream rewrite (rebase) | |
117 \item Some commits are historical record, should not be rewritten | |
118 \item Safely sharing rewritten commits with remote repos | |
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 |
27 | 121 Goal: provide a clean, consistent UI to solve these problems. |
2 | 122 \end{frame} |
123 | |
124 \begin{frame} | |
125 \begin{table} | |
126 \pgfimage[height=2in]{hg-logo} | |
127 \end{table} | |
27 | 128 \begin{center} |
129 Mercurial Evolve to the rescue! | |
130 \end{center} | |
2 | 131 \end{frame} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
132 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
133 \begin{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
134 {\Large \textbf{Evolve basics}} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
135 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
|
136 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
137 \begin{columns} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
138 \column{0.3 \textwidth} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
139 \begin{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
140 \item \texttt{amend} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
141 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
142 \item \texttt{fold} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
143 \pause |
32
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
144 \item \texttt{reorder} |
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
145 \pause |
13
c48ed0e2ab41
Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
7
diff
changeset
|
146 \item \texttt{previous} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
147 \pause |
13
c48ed0e2ab41
Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
7
diff
changeset
|
148 \item \texttt{next} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
149 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
150 \item \texttt{prune} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
151 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
152 \item \texttt{uncommit} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
153 \pause |
15
1c59bbe16b18
Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14
diff
changeset
|
154 \item \texttt{restore} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
155 \end{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
156 \pause |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
157 \column{0.7 \textwidth} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
158 \begin{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
159 \item \texttt{hg commit -{}-amend} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
160 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
161 \item can be done with \texttt{hg histedit} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
162 \pause |
32
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
163 \item can be done with \texttt{hg histedit} |
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
164 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
165 \item \texttt{hg update -r 'parents()'} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
166 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
167 \item \texttt{hg update -r 'children()'} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
168 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
169 \item \texttt{hg strip} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
170 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
171 \item \texttt{hg strip -{}-keep} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
172 \pause |
15
1c59bbe16b18
Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14
diff
changeset
|
173 \item \texttt{hg unbundle strip-backup/...} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
174 \end{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
175 \end{columns} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
176 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
177 \begin{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
178 {\large These are very scriptable!} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
179 \end{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
180 \end{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
181 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
182 \begin{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
183 {\Large \textbf{Evolve basics}} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
184 For reference, these are the rough git equivalents: |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
185 \begin{columns} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
186 \column{0.3 \textwidth} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
187 \begin{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
188 \item \texttt{amend} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
189 \item \texttt{fold} |
32
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
190 \item \texttt{reorder} |
13
c48ed0e2ab41
Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
7
diff
changeset
|
191 \item \texttt{previous} |
c48ed0e2ab41
Rename gup and gdown to next and previous
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
7
diff
changeset
|
192 \item \texttt{next} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
193 \item \texttt{prune} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
194 \item \texttt{uncommit} |
15
1c59bbe16b18
Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14
diff
changeset
|
195 \item \texttt{restore} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
196 \end{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
197 \column{0.7 \textwidth} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
198 \begin{itemize} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
199 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
200 \item \texttt{git commit -{}-amend} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
201 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
202 \item can be done with \texttt{git rebase -i} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
203 \pause |
32
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
204 \item can be done with \texttt{git rebase -i} |
e7d4f5528b5d
Add a reorder command as if it already existed (explain it doesn't yet)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
31
diff
changeset
|
205 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
206 \item \texttt{git checkout HEAD\^} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
207 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
208 \item Nothing simple, must use log or reflog |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
209 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
210 \item \texttt{git reset -{}-hard HEAD\^} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
211 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
212 \item \texttt{git reset -{}-soft HEAD\^} |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
213 \pause |
15
1c59bbe16b18
Add restore command to slides (hg touch, renamed)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14
diff
changeset
|
214 \item Nothing simple, must use reflog |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
215 \end{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
216 \end{columns} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
217 \end{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
218 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
219 \begin{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
220 {\Large \textbf{Evolve's core}} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
221 There's also a shiny, new command that does magic: |
31
f42eee738337
Add more pauses in the command list
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
27
diff
changeset
|
222 \pause |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
223 \begin{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
224 {\Large \texttt{hg evolve}} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
225 \end{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
226 \begin{table} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
227 \pgfimage[height=2in]{logo-evolve} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
228 \end{table} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
229 \begin{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
230 \begin{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
231 \pause |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
232 \item |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
233 Basically, automatically fixes any problems |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
234 \item |
17
c657209f840b
Minor rewordings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16
diff
changeset
|
235 recovers from upstream rebase (solves Problem 1) |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
236 \end{itemize} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
237 \end{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
238 \end{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
239 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
240 \begin{frame} |
14
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
241 {\Large \textbf{Immutable history}} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
242 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
|
243 \begin{table} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
244 \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
|
245 \end{table} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
246 \pause |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
247 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
|
248 \pause |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
249 \begin{itemize} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
250 \item public (immutable) |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
251 \item draft (editable) |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
252 \end{itemize} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
253 \end{frame} |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
254 |
e99a93596676
Add a slide and example showcasing phases
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13
diff
changeset
|
255 \begin{frame} |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
256 \begin{center} |
17
c657209f840b
Minor rewordings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
16
diff
changeset
|
257 Let's see Evolve in action! |
6
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
258 |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
259 \fontsize{68}{80}\selectfont \lefthand |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
260 \end{center} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
261 \end{frame} |
7072c39785c9
Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
5
diff
changeset
|
262 |
16
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
263 \begin{frame} |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
264 {\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
|
265 |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
266 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
|
267 |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
268 \begin{itemize} |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
269 \pause |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
270 \item What about sharing with others? |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
271 \pause |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
272 \item Those revision numbers skipping around? |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
273 \end{itemize} |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
274 |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
275 \end{frame} |
389af285236f
New slide hinting at obsolescence markers
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15
diff
changeset
|
276 |
20
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
277 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
278 {\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
|
279 \begin{itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
280 \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
|
281 \pause |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
282 \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
|
283 \pause |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
284 \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
|
285 \begin {itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
286 \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
|
287 \item \texttt{amend} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
288 \end{itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
289 \pause |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
290 \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
|
291 \begin{itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
292 \item \texttt{prune} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
293 \end{itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
294 \pause |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
295 \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
|
296 \end{itemize} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
297 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
298 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
299 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
300 {\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
|
301 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
302 \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
|
303 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
304 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
305 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
306 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
307 {\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
|
308 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
309 \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
|
310 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
311 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
312 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
313 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
314 {\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
|
315 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
316 \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
|
317 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
318 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
319 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
320 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
321 {\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
|
322 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
323 \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
|
324 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
325 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
326 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
327 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
328 {\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
|
329 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
330 \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
|
331 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
332 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
333 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
334 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
335 {\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
|
336 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
337 \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
|
338 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
339 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
340 |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
341 \begin{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
342 {\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
|
343 \begin{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
344 \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
|
345 \end{table} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
346 \end{frame} |
5eb72904e11c
Add explanation of how Evolve pushes stuff around
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
19
diff
changeset
|
347 |
21
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
348 \begin{frame} |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
349 \begin{center} |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
350 Let's see Evolve sharing commits around! |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
351 |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
352 \fontsize{68}{80}\selectfont \lefthand |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
353 \end{center} |
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
354 \end{frame} |
26
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
355 |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
356 \begin{frame} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
357 {\Large \textbf{Evolve's solutions}} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
358 \begin{enumerate} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
359 \item Recovering from upstream rewrite (rebase) |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
360 \pause |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
361 \begin{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
362 \item \emph{Solution}: \texttt{hg evolve} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
363 \end{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
364 \pause |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
365 \item Some commits are historical record, should not be rewritten |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
366 \pause |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
367 \begin{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
368 \item \emph{Solution}: Public and draft phases |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
369 \end{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
370 \pause |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
371 \item Safely sharing rewritten commits with remote repos |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
372 \pause |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
373 \begin{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
374 \item \emph{Solution}: Obsolescence markers |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
375 \end{itemize} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
376 \end{enumerate} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
377 \end{frame} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
378 |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
379 \begin{frame} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
380 \begin{center} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
381 \fontsize{58}{70}\selectfont Questions? |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
382 \end{center} |
95b79f82a200
Add summary of final points
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
21
diff
changeset
|
383 \end{frame} |
21
86607675e0a8
Announce another shell session...
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20
diff
changeset
|
384 |
1
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
385 \end{document} |