Mercurial > evolve-talk

annotate talk.tex @ 1:4223c8ce1cc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start presentation
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 07 Mar 2014 11:04:16 -0500
parents
children 6e67194fc283
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}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
3 \usepackage{bm}
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 ~ \\
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
24 hg clone http://inversethought.com/hg/evolve-talk}
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}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
40 \textbf{The problems with collaborative rewriting}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
41 \begin{itemize}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
42 \pause
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
43 \item Recovering from upstream rewrite (rebase)
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
44 \pause
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
45 \begin{quote}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
46 Rebasing (or any other form of rewriting) a branch that others
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
47 have based work on is a bad idea: anyone downstream of it is
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
48 forced to manually fix their history.
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
49 \end{quote}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
50 ... from git-rebase(7)
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
51 \end{itemize}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
52 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
53
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
54 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
55 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
56 \pgfimage[height=3in]{rebase1}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
57 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
58 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
59
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
60 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
61 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
62 \pgfimage[height=3in]{rebase2}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
63 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
64 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
65
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
66 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
67 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
68 \pgfimage[height=3in]{ohcrap}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
69 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
70 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
71
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
72 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
73 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
74 \pgfimage[height=3in]{rebase3}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
75 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
76 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
77
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
78 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
79 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
80 \pgfimage[height=3in]{rebase4}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
81 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
82 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
83
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
84 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
85 \begin{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
86 \pgfimage[height=3in]{git-rebase}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
87 \end{center}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
88 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
89
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
90
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
91 \begin{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
92 \textbf{The problems with collaborative rewriting}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
93 \begin{itemize}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
94 \pause
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
95 \item When is rewriting ok, when is it a lie?
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
96 \pause
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
97 \item R
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
98 \end{itemize}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
99 Changeset evolution to the rescue!
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
100 \end{frame}
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
101
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
102
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
103
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
104 \end{document}