Mercurial > hg > mercurial-talk
changeset 145:f8f2167cc21b
Unused slide on push/pull.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Mon, 26 Apr 2010 16:55:22 +0200 |
parents | f169f5000bf0 |
children | 4c0638755117 |
files | mercurial.tex push-pull.tex |
diffstat | 2 files changed, 75 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial.tex +++ b/mercurial.tex @@ -612,82 +612,6 @@ \end{itemize} \end{frame} -%\begin{frame}{Pushing and Pulling} -% \tikzstyle{rev}+=[on chain, join] -% \tikzset{node distance=4mm} -% -% Having made local commits, we need to publish them: -% \begin{itemize} -% \item<1-> pushing: moves changesets to another repository -% -% \begin{tikzpicture} -% \begin{scope}[start chain=a] -% \node[rev] {}; -% \node[rev] {}; -% \node[rev] {}; -% \node[rev] {}; -% \end{scope} -% -% \node[invisible] at (a-begin.north) {}; -% \node[invisible] at (a-begin.south) {}; -% -% \begin{pgfonlayer}{background} -% \node<2>[highlight, fit=(a-3) (a-4)] {}; -% \end{pgfonlayer} -% -% \begin{scope}[start chain=b] -% \node[rev, right=5cm of a-begin] {}; -% \node[rev] {}; -% \node<3->[rev] {}; -% \node<3->[rev] {}; -% \end{scope} -% -% \draw<3->[short,->] (a-end) -- node[below] {\cmd{hg push}} (b-begin); -% -% \begin{pgfonlayer}{background} -% \node<3>[highlight, fit=(b-3) (b-4)] {}; -% \end{pgfonlayer} -% \end{tikzpicture} -% -% \item<4-> pulling: moves changesets into your repository -% -% \begin{tikzpicture} -% \begin{scope}[start chain=a] -% \node[rev] {}; -% \node[rev] {}; -% \node<6->[rev] {}; -% \node<6->[rev] {}; -% \end{scope} -% -% \node[invisible] at (a-end.north) {}; -% \node[invisible] at (a-end.south) {}; -% -% \begin{pgfonlayer}{background} -% \node<6>[highlight, fit=(a-3) (a-4)] {}; -% \end{pgfonlayer} -% -% \begin{scope}[start chain=b] -% \node[rev, right=5cm of a-begin] {}; -% \node[rev] {}; -% \node[rev] {}; -% \node[rev] {}; -% \end{scope} -% -% \begin{pgfonlayer}{background} -% \node<5>[highlight, fit=(b-3) (b-4)] {}; -% \end{pgfonlayer} -% -% \draw<6->[short,->] (b-begin) -- node[below] {\cmd{hg pull}} (a-end); -% -% \end{tikzpicture} -% -% \item<7-> \cmd{hg push} and \cmd{hg pull} are symmetric -% -% \item<7-> \cmd{hg clone} $=$ \cmd{hg init} $+$ \cmd{hg pull}\\ -% (but more space-efficient on local disks) -% \end{itemize} -%\end{frame} - \subsection{Workflows} \include{central-workflow}
new file mode 100644 --- /dev/null +++ b/push-pull.tex @@ -0,0 +1,75 @@ +\begin{frame}{Pushing and Pulling} + \tikzstyle{rev}+=[on chain, join] + \tikzset{node distance=4mm} + + Having made local commits, we need to publish them: + \begin{itemize} + \item<1-> pushing: moves changesets to another repository + + \begin{tikzpicture} + \begin{scope}[start chain=a] + \node[rev] {}; + \node[rev] {}; + \node[rev] {}; + \node[rev] {}; + \end{scope} + + \node[invisible] at (a-begin.north) {}; + \node[invisible] at (a-begin.south) {}; + + \begin{pgfonlayer}{background} + \node<2>[highlight, fit=(a-3) (a-4)] {}; + \end{pgfonlayer} + + \begin{scope}[start chain=b] + \node[rev, right=5cm of a-begin] {}; + \node[rev] {}; + \node<3->[rev] {}; + \node<3->[rev] {}; + \end{scope} + + \draw<3->[short,->] (a-end) -- node[below] {\cmd{hg push}} (b-begin); + + \begin{pgfonlayer}{background} + \node<3>[highlight, fit=(b-3) (b-4)] {}; + \end{pgfonlayer} + \end{tikzpicture} + + \item<4-> pulling: moves changesets into your repository + + \begin{tikzpicture} + \begin{scope}[start chain=a] + \node[rev] {}; + \node[rev] {}; + \node<6->[rev] {}; + \node<6->[rev] {}; + \end{scope} + + \node[invisible] at (a-end.north) {}; + \node[invisible] at (a-end.south) {}; + + \begin{pgfonlayer}{background} + \node<6>[highlight, fit=(a-3) (a-4)] {}; + \end{pgfonlayer} + + \begin{scope}[start chain=b] + \node[rev, right=5cm of a-begin] {}; + \node[rev] {}; + \node[rev] {}; + \node[rev] {}; + \end{scope} + + \begin{pgfonlayer}{background} + \node<5>[highlight, fit=(b-3) (b-4)] {}; + \end{pgfonlayer} + + \draw<6->[short,->] (b-begin) -- node[below] {\cmd{hg pull}} (a-end); + + \end{tikzpicture} + + \item<7-> \cmd{hg push} and \cmd{hg pull} are symmetric + + \item<7-> \cmd{hg clone} $=$ \cmd{hg init} $+$ \cmd{hg pull}\\ + (but more space-efficient on local disks) + \end{itemize} +\end{frame}