Mercurial > evolve-talk
view talk.tex @ 5:627f34ce7c58
Update used packages
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sat, 08 Mar 2014 19:06:04 -0500 |
parents | 038a7e7b9820 |
children | 7072c39785c9 |
line wrap: on
line source
%%% BEGIN BEAMER PREAMBLE %%% \documentclass[green]{beamer} \usepackage{bm, fourier, anyfontsize} \mode<presentation> { \usetheme{boxes} \usecolortheme{crane} } \beamertemplatenavigationsymbolsempty \usepackage{times} %%% END BEAMER PREAMBLE %%% %%% BEGIN METADATA %%% \author{Jordi G. H. $\langle$jordigh@octave.org$\rangle$ \\ ~ \\ hg clone http://hg.octave.org/evolve-talk} \title{Changeset Evolution in Mercurial} \subtitle{Edit commits collaboratively!} \date{} %%% END METADATA%%% \begin{document} \begin{frame} \titlepage \end{frame} \begin{frame} {\Large \textbf{Problems that Evolve is trying to solve}} \pause \textbf{Problem 1}: Recovering from upstream rewrite (rebase) \pause \begin{quote} Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. \end{quote} ... from git-rebase(7) \end{frame} \begin{frame} \begin{center} \pgfimage[height=3in]{rebase1} \end{center} \end{frame} \begin{frame} \begin{center} \pgfimage[height=3in]{rebase2} \end{center} \end{frame} \begin{frame} \begin{center} \pgfimage[height=3in]{ohcrap} \end{center} \end{frame} \begin{frame} \begin{center} \pgfimage[height=3in]{rebase3} \end{center} \end{frame} \begin{frame} \begin{center} \pgfimage[height=3in]{rebase4} \end{center} \end{frame} \begin{frame} \begin{center} \pgfimage[height=3.69in]{git-rebase} \end{center} \end{frame} \begin{frame} {\Large \textbf{Problems that Evolve is trying to solve}} \textbf{Problem 2}: Some commits are historical record, should not be rewritten \pause \begin{table} \pgfimage[width=4in]{histedit} \end{table} \end{frame} \begin{frame} {\Large \textbf{Problems that Evolve is trying to solve}} \textbf{Problem 3}: Safely sharing rewritten commits with remote repos \pause \begin{table} \pgfimage[width=4in]{lol-jenkins} \end{table} \end{frame} \begin{frame} \begin{table} \pgfimage[height=3in]{git-force-push} \end{table} \end{frame} \begin{frame} {\Large \textbf{Problems that Evolve is trying to solve}} \begin{enumerate} \item Recovering from upstream rewrite (rebase) \item Some commits are historical record, should not be rewritten \item Safely sharing rewritten commits with remote repos \end{enumerate} \end{frame} \begin{frame} \begin{table} \pgfimage[height=2in]{hg-logo} \end{table} Mercurial Evolve to the rescue! \end{frame} \end{document}