changeset 141:896203970327

Split off slide on histedit extension.
author Martin Geisler <mg@aragost.com>
date Mon, 26 Apr 2010 16:49:12 +0200
parents 92c5316d9562
children d2f24d31a996
files histedit.tex mercurial.tex
diffstat 2 files changed, 56 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/histedit.tex
@@ -0,0 +1,55 @@
+\begin{frame}{Editing History}
+  \tikzstyle{rev}+=[on chain, minimum size=6mm]
+  \tikzstyle{squiggle}=[on chain, font=\large, red]
+  \tikzset{node distance=5mm}
+
+  Inspired by \cmd{git rebase -i}, \ext{histedit} lets you
+  \begin{itemize}[<+->]
+  \item reorder changesets:
+
+    \begin{tikzpicture}[start chain]
+      \node[rev] {$A$};
+      \node[rev,join] {$B$};
+      \node[rev,join] {$C$};
+      \node[squiggle] {$\rightsquigarrow$};
+      \node[rev] {$A$};
+      \node[rev,join] {$C'$};
+      \node[rev,join] {$B'$};
+    \end{tikzpicture}
+
+  \item fold changesets:
+
+    \begin{tikzpicture}[start chain]
+      \node[rev] {$A$};
+      \node[rev,join] {$B$};
+      \node[rev,join] {$C$};
+      \node[squiggle] {$\rightsquigarrow$};
+      \node[rev] {$A$};
+      \node[rev,join] {$BC$};
+    \end{tikzpicture}
+
+  \item drop changesets:
+
+    \begin{tikzpicture}[start chain]
+      \node[rev] {$A$};
+      \node[rev,join] {$B$};
+      \node[rev,join] {$C$};
+      \node[squiggle] {$\rightsquigarrow$};
+      \node[rev] {$A$};
+      \node[rev,join] {$C'$};
+    \end{tikzpicture}
+
+  \item edit changesets:
+
+    \begin{tikzpicture}[start chain]
+      \node[rev] {$A$};
+      \node[rev,join] {$B$};
+      \node[rev,join] {$C$};
+      \node[squiggle] {$\rightsquigarrow$};
+      \node[rev] {$A$};
+      \node[rev,join] {$X$};
+      \node[rev,join] {$B'$};
+      \node[rev,join] {$C'$};
+    \end{tikzpicture}
+  \end{itemize}
+\end{frame}
--- a/mercurial.tex
+++ b/mercurial.tex
@@ -766,61 +766,7 @@
 
 \include{mq}
 
-\begin{frame}{Editing History}
-  \tikzstyle{rev}+=[on chain, minimum size=6mm]
-  \tikzstyle{squiggle}=[on chain, font=\large, red]
-  \tikzset{node distance=5mm}
-
-  Inspired by \cmd{git rebase -i}, \ext{histedit} lets you
-  \begin{itemize}[<+->]
-  \item reorder changesets:
-
-    \begin{tikzpicture}[start chain]
-      \node[rev] {$A$};
-      \node[rev,join] {$B$};
-      \node[rev,join] {$C$};
-      \node[squiggle] {$\rightsquigarrow$};
-      \node[rev] {$A$};
-      \node[rev,join] {$C'$};
-      \node[rev,join] {$B'$};
-    \end{tikzpicture}
-
-  \item fold changesets:
-
-    \begin{tikzpicture}[start chain]
-      \node[rev] {$A$};
-      \node[rev,join] {$B$};
-      \node[rev,join] {$C$};
-      \node[squiggle] {$\rightsquigarrow$};
-      \node[rev] {$A$};
-      \node[rev,join] {$BC$};
-    \end{tikzpicture}
-
-  \item drop changesets:
-
-    \begin{tikzpicture}[start chain]
-      \node[rev] {$A$};
-      \node[rev,join] {$B$};
-      \node[rev,join] {$C$};
-      \node[squiggle] {$\rightsquigarrow$};
-      \node[rev] {$A$};
-      \node[rev,join] {$C'$};
-    \end{tikzpicture}
-
-  \item edit changesets:
-
-    \begin{tikzpicture}[start chain]
-      \node[rev] {$A$};
-      \node[rev,join] {$B$};
-      \node[rev,join] {$C$};
-      \node[squiggle] {$\rightsquigarrow$};
-      \node[rev] {$A$};
-      \node[rev,join] {$X$};
-      \node[rev,join] {$B'$};
-      \node[rev,join] {$C'$};
-    \end{tikzpicture}
-  \end{itemize}
-\end{frame}
+\include{histedit}
 
 \subsection{Talking to Other Systems}