Mercurial > evolve-talk
annotate talk.tex @ 5:627f34ce7c58
Update used packages
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sat, 08 Mar 2014 19:06:04 -0500 |
parents | 038a7e7b9820 |
children | 7072c39785c9 |
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> |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
8 { |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
9 \usetheme{boxes} |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
10 \usecolortheme{crane} |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
11 } |
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$ \\ |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
23 ~ \\ |
3
038a7e7b9820
Update url to this repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
2
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} |
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
28 \subtitle{Edit commits collaboratively!} |
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} | |
120 \end{frame} | |
121 | |
122 \begin{frame} | |
123 \begin{table} | |
124 \pgfimage[height=2in]{hg-logo} | |
125 \end{table} | |
126 Mercurial Evolve to the rescue! | |
127 \end{frame} | |
1
4223c8ce1cc0
Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff
changeset
|
128 \end{document} |