Mercurial > evolve-talk
changeset 1:4223c8ce1cc0
Start presentation
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Fri, 07 Mar 2014 11:04:16 -0500 |
parents | 1d082a68782e |
children | 6e67194fc283 |
files | talk.tex |
diffstat | 1 files changed, 104 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/talk.tex Fri Mar 07 11:04:16 2014 -0500 @@ -0,0 +1,104 @@ +%%% BEGIN BEAMER PREAMBLE %%% +\documentclass[green]{beamer} +\usepackage{bm} + + + +\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://inversethought.com/hg/evolve-talk} + + +\title{Changeset Evolution in Mercurial} +\subtitle{Edit commits collaboratively!} +\date{} + +%%% END METADATA%%% + +\begin{document} + +\begin{frame} + \titlepage +\end{frame} + +\begin{frame} + \textbf{The problems with collaborative rewriting} + \begin{itemize} + \pause + \item 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{itemize} +\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=3in]{git-rebase} + \end{center} +\end{frame} + + +\begin{frame} + \textbf{The problems with collaborative rewriting} + \begin{itemize} + \pause + \item When is rewriting ok, when is it a lie? + \pause + \item R + \end{itemize} + Changeset evolution to the rescue! +\end{frame} + + + +\end{document} \ No newline at end of file