Mercurial > evolve-talk

comparison talk.tex @ 2:6e67194fc283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finalise intro
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sat, 08 Mar 2014 16:34:23 -0500
parents 4223c8ce1cc0
children 038a7e7b9820
comparison
equal deleted inserted replaced
1:4223c8ce1cc0 2:6e67194fc283
1 %%% BEGIN BEAMER PREAMBLE %%% 1 %%% BEGIN BEAMER PREAMBLE %%%
2 \documentclass[green]{beamer} 2 \documentclass[green]{beamer}
3 \usepackage{bm} 3 \usepackage{bm, multimedia}
4 4
5 5
6 6
7 \mode<presentation> 7 \mode<presentation>
8 { 8 {
35 \begin{frame} 35 \begin{frame}
36 \titlepage 36 \titlepage
37 \end{frame} 37 \end{frame}
38 38
39 \begin{frame} 39 \begin{frame}
40 \textbf{The problems with collaborative rewriting} 40 {\Large \textbf{Problems that Evolve is trying to solve}}
41 \begin{itemize} 41 \pause
42 \pause 42 \textbf{Problem 1}: Recovering from upstream rewrite (rebase)
43 \item Recovering from upstream rewrite (rebase) 43 \pause
44 \pause 44 \begin{quote}
45 \begin{quote} 45 Rebasing (or any other form of rewriting) a branch that others
46 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 have based work on is a bad idea: anyone downstream of it is 47 forced to manually fix their history.
48 forced to manually fix their history. 48 \end{quote}
49 \end{quote} 49 ... from git-rebase(7)
50 ... from git-rebase(7)
51 \end{itemize}
52 \end{frame} 50 \end{frame}
53 51
54 \begin{frame} 52 \begin{frame}
55 \begin{center} 53 \begin{center}
56 \pgfimage[height=3in]{rebase1} 54 \pgfimage[height=3in]{rebase1}
81 \end{center} 79 \end{center}
82 \end{frame} 80 \end{frame}
83 81
84 \begin{frame} 82 \begin{frame}
85 \begin{center} 83 \begin{center}
86 \pgfimage[height=3in]{git-rebase} 84 \pgfimage[height=3.69in]{git-rebase}
87 \end{center} 85 \end{center}
88 \end{frame} 86 \end{frame}
89 87
90 88
91 \begin{frame} 89 \begin{frame}
92 \textbf{The problems with collaborative rewriting} 90 {\Large \textbf{Problems that Evolve is trying to solve}}
93 \begin{itemize} 91 \textbf{Problem 2}: Some commits are historical record, should not be rewritten
94 \pause 92 \pause
95 \item When is rewriting ok, when is it a lie? 93 \begin{table}
96 \pause 94 \pgfimage[width=4in]{histedit}
97 \item R 95 \end{table}
98 \end{itemize}
99 Changeset evolution to the rescue!
100 \end{frame} 96 \end{frame}
101 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}
105 \end{frame}
102 106
107 \begin{frame}
108 \begin{table}
109 \pgfimage[height=3in]{git-force-push}
110 \end{table}
111 \end{frame}
103 112
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}
104 \end{document} 128 \end{document}