Mercurial > evolve-talk
comparison talk.tex @ 6:7072c39785c9
Basic evolve commands
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Sat, 08 Mar 2014 19:12:15 -0500 |
| parents | 627f34ce7c58 |
| children | edc5ae89b6ea |
comparison
equal
deleted
inserted
replaced
| 5:627f34ce7c58 | 6:7072c39785c9 |
|---|---|
| 123 \begin{table} | 123 \begin{table} |
| 124 \pgfimage[height=2in]{hg-logo} | 124 \pgfimage[height=2in]{hg-logo} |
| 125 \end{table} | 125 \end{table} |
| 126 Mercurial Evolve to the rescue! | 126 Mercurial Evolve to the rescue! |
| 127 \end{frame} | 127 \end{frame} |
| 128 | |
| 129 \begin{frame} | |
| 130 {\Large \textbf{Evolve basics}} | |
| 131 When you enable Evolve, you get a few extra commands: | |
| 132 | |
| 133 \begin{columns} | |
| 134 \column{0.3 \textwidth} | |
| 135 \begin{itemize} | |
| 136 \item \texttt{amend} | |
| 137 \item \texttt{fold} | |
| 138 \item \texttt{gdown} | |
| 139 \item \texttt{gup} | |
| 140 \item \texttt{prune} | |
| 141 \item \texttt{uncommit} | |
| 142 \end{itemize} | |
| 143 \pause | |
| 144 \column{0.7 \textwidth} | |
| 145 \begin{itemize} | |
| 146 \item \texttt{hg commit -{}-amend} | |
| 147 \item can be done with \texttt{hg histedit} | |
| 148 \item \texttt{hg update -r 'parents()'} | |
| 149 \item \texttt{hg update -r 'children()'} | |
| 150 \item \texttt{hg strip} | |
| 151 \item \texttt{hg strip -{}-keep} | |
| 152 \end{itemize} | |
| 153 \end{columns} | |
| 154 \begin{center} | |
| 155 {\large These are very scriptable!} | |
| 156 \end{center} | |
| 157 \end{frame} | |
| 158 | |
| 159 \begin{frame} | |
| 160 {\Large \textbf{Evolve basics}} | |
| 161 For reference, these are the rough git equivalents: | |
| 162 \begin{columns} | |
| 163 \column{0.3 \textwidth} | |
| 164 \begin{itemize} | |
| 165 \item \texttt{amend} | |
| 166 \item \texttt{fold} | |
| 167 \item \texttt{gdown} | |
| 168 \item \texttt{gup} | |
| 169 \item \texttt{prune} | |
| 170 \item \texttt{uncommit} | |
| 171 \end{itemize} | |
| 172 \column{0.7 \textwidth} | |
| 173 \begin{itemize} | |
| 174 \item \texttt{git commit -{}-amend} | |
| 175 \item can be done with \texttt{git rebase -i} | |
| 176 \item \texttt{git checkout HEAD\^} | |
| 177 \item Nothing simple, must use log or reflog | |
| 178 \item \texttt{git reset -{}-hard HEAD\^} | |
| 179 \item \texttt{git reset -{}-soft HEAD\^} | |
| 180 \end{itemize} | |
| 181 \end{columns} | |
| 182 \end{frame} | |
| 183 | |
| 184 \begin{frame} | |
| 185 {\Large \textbf{Evolve's core}} | |
| 186 There's also a shiny, new command that does magic: | |
| 187 \begin{center} | |
| 188 {\Large \texttt{hg evolve}} | |
| 189 \end{center} | |
| 190 \begin{table} | |
| 191 \pgfimage[height=2in]{logo-evolve} | |
| 192 \end{table} | |
| 193 \begin{center} | |
| 194 \begin{itemize} | |
| 195 \pause | |
| 196 \item | |
| 197 Basically, automatically fixes any problems | |
| 198 \item | |
| 199 Rebases back to upstream and more! | |
| 200 \end{itemize} | |
| 201 \end{center} | |
| 202 \end{frame} | |
| 203 | |
| 204 \begin{frame} | |
| 205 \begin{center} | |
| 206 Let's see evolve in action! | |
| 207 | |
| 208 \fontsize{68}{80}\selectfont \lefthand | |
| 209 \end{center} | |
| 210 \end{frame} | |
| 211 | |
| 128 \end{document} | 212 \end{document} |