Mercurial > evolve-talk

comparison 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
comparison
equal deleted inserted replaced
0:1d082a68782e 1:4223c8ce1cc0
1 %%% BEGIN BEAMER PREAMBLE %%%
2 \documentclass[green]{beamer}
3 \usepackage{bm}
4
5
6
7 \mode<presentation>
8 {
9 \usetheme{boxes}
10 \usecolortheme{crane}
11 }
12 \beamertemplatenavigationsymbolsempty
13
14 \usepackage{times}
15 %%% END BEAMER PREAMBLE %%%
16
17
18
19
20 %%% BEGIN METADATA %%%
21
22 \author{Jordi G. H. $\langle$jordigh@octave.org$\rangle$ \\
23 ~ \\
24 hg clone http://inversethought.com/hg/evolve-talk}
25
26
27 \title{Changeset Evolution in Mercurial}
28 \subtitle{Edit commits collaboratively!}
29 \date{}
30
31 %%% END METADATA%%%
32
33 \begin{document}
34
35 \begin{frame}
36 \titlepage
37 \end{frame}
38
39 \begin{frame}
40 \textbf{The problems with collaborative rewriting}
41 \begin{itemize}
42 \pause
43 \item Recovering from upstream rewrite (rebase)
44 \pause
45 \begin{quote}
46 Rebasing (or any other form of rewriting) a branch that others
47 have based work on is a bad idea: anyone downstream of it is
48 forced to manually fix their history.
49 \end{quote}
50 ... from git-rebase(7)
51 \end{itemize}
52 \end{frame}
53
54 \begin{frame}
55 \begin{center}
56 \pgfimage[height=3in]{rebase1}
57 \end{center}
58 \end{frame}
59
60 \begin{frame}
61 \begin{center}
62 \pgfimage[height=3in]{rebase2}
63 \end{center}
64 \end{frame}
65
66 \begin{frame}
67 \begin{center}
68 \pgfimage[height=3in]{ohcrap}
69 \end{center}
70 \end{frame}
71
72 \begin{frame}
73 \begin{center}
74 \pgfimage[height=3in]{rebase3}
75 \end{center}
76 \end{frame}
77
78 \begin{frame}
79 \begin{center}
80 \pgfimage[height=3in]{rebase4}
81 \end{center}
82 \end{frame}
83
84 \begin{frame}
85 \begin{center}
86 \pgfimage[height=3in]{git-rebase}
87 \end{center}
88 \end{frame}
89
90
91 \begin{frame}
92 \textbf{The problems with collaborative rewriting}
93 \begin{itemize}
94 \pause
95 \item When is rewriting ok, when is it a lie?
96 \pause
97 \item R
98 \end{itemize}
99 Changeset evolution to the rescue!
100 \end{frame}
101
102
103
104 \end{document}