Mercurial > evolve-talk

annotate talk.tex @ 6:7072c39785c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Basic evolve commands
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sat, 08 Mar 2014 19:12:15 -0500
parents 627f34ce7c58
children edc5ae89b6ea
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}
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
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
40 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
41 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
42 \textbf{Problem 1}: Recovering from upstream rewrite (rebase)
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
43 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
44 \begin{quote}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
45 Rebasing (or any other form of rewriting) a branch that others
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
46 have based work on is a bad idea: anyone downstream of it is
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
47 forced to manually fix their history.
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
48 \end{quote}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
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
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
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
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
90 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
91 \textbf{Problem 2}: Some commits are historical record, should not be rewritten
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
92 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
93 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
94 \pgfimage[width=4in]{histedit}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
95 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
96 \end{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
97
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
98 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
99 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
100 \textbf{Problem 3}: Safely sharing rewritten commits with remote repos
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
101 \pause
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
102 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
103 \pgfimage[width=4in]{lol-jenkins}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
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
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
107 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
108 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
109 \pgfimage[height=3in]{git-force-push}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
110 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
111 \end{frame}
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
112
2
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
113 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
114 {\Large \textbf{Problems that Evolve is trying to solve}}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
115 \begin{enumerate}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
116 \item Recovering from upstream rewrite (rebase)
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
117 \item Some commits are historical record, should not be rewritten
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
118 \item Safely sharing rewritten commits with remote repos
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
119 \end{enumerate}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
120 \end{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
121
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
122 \begin{frame}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
123 \begin{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
124 \pgfimage[height=2in]{hg-logo}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
125 \end{table}
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
126 Mercurial Evolve to the rescue!
6e67194fc283 Finalise intro
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 1
diff changeset
127 \end{frame}
6
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
128
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
129 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
130 {\Large \textbf{Evolve basics}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
131 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
132
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
133 \begin{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
134 \column{0.3 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
135 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
136 \item \texttt{amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
137 \item \texttt{fold}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
138 \item \texttt{gdown}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
139 \item \texttt{gup}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
140 \item \texttt{prune}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
141 \item \texttt{uncommit}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
142 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
143 \pause
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
144 \column{0.7 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
145 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
146 \item \texttt{hg commit -{}-amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
147 \item can be done with \texttt{hg histedit}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
148 \item \texttt{hg update -r 'parents()'}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
149 \item \texttt{hg update -r 'children()'}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
150 \item \texttt{hg strip}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
151 \item \texttt{hg strip -{}-keep}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
152 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
153 \end{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
154 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
155 {\large These are very scriptable!}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
156 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
157 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
158
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
159 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
160 {\Large \textbf{Evolve basics}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
161 For reference, these are the rough git equivalents:
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
162 \begin{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
163 \column{0.3 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
164 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
165 \item \texttt{amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
166 \item \texttt{fold}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
167 \item \texttt{gdown}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
168 \item \texttt{gup}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
169 \item \texttt{prune}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
170 \item \texttt{uncommit}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
171 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
172 \column{0.7 \textwidth}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
173 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
174 \item \texttt{git commit -{}-amend}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
175 \item can be done with \texttt{git rebase -i}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
176 \item \texttt{git checkout HEAD\^}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
177 \item Nothing simple, must use log or reflog
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
178 \item \texttt{git reset -{}-hard HEAD\^}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
179 \item \texttt{git reset -{}-soft HEAD\^}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
180 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
181 \end{columns}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
182 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
183
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
184 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
185 {\Large \textbf{Evolve's core}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
186 There's also a shiny, new command that does magic:
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
187 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
188 {\Large \texttt{hg evolve}}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
189 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
190 \begin{table}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
191 \pgfimage[height=2in]{logo-evolve}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
192 \end{table}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
193 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
194 \begin{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
195 \pause
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
196 \item
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
197 Basically, automatically fixes any problems
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
198 \item
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
199 Rebases back to upstream and more!
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
200 \end{itemize}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
201 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
202 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
203
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
204 \begin{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
205 \begin{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
206 Let's see evolve in action!
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
207
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
208 \fontsize{68}{80}\selectfont \lefthand
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
209 \end{center}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
210 \end{frame}
7072c39785c9 Basic evolve commands
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 5
diff changeset
211
1
4223c8ce1cc0 Start presentation
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
212 \end{document}