Mercurial > hg > mercurial-talk
changeset 156:8e2b0c9522f5
Split off slides on key commands and concepts.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Tue, 27 Apr 2010 09:18:04 +0200 (2010-04-27) |
| parents | d245498bc39e |
| children | 8f625aa11c10 |
| files | key-commands.tex key-concepts.tex mercurial.tex |
| diffstat | 3 files changed, 34 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/key-commands.tex @@ -0,0 +1,14 @@ +\begin{frame}{Key Mercurial Commands} + Local commands: + \begin{itemize} + \item \cmd{hg commit}: save your changes in the current repository. + \item \cmd{hg update}: checkout revision into working directory. + \item \cmd{hg merge}: join different lines of history. + \end{itemize} + + Network commands: + \begin{itemize} + \item \cmd{hg pull}: retrieve changesets from another repository. + \item \cmd{hg push}: send your changesets to another repository. + \end{itemize} +\end{frame}
new file mode 100644 --- /dev/null +++ b/key-concepts.tex @@ -0,0 +1,18 @@ +\begin{frame}{Key Concepts} + \begin{tikzpicture} + \tikzstyle{repository}+=[minimum height=18mm, text width=15mm] + + \node[repository] (a) {}; + \node[working copy, left=2cm of a] (working copy) {hello.c\\Makefile}; + \draw[short, ->] (working copy) to[bend left=10] node[above] {commit} (a); + \draw[short, ->] (a) to[bend left=10] node[below] {update} (working copy); + + \begin{pgfonlayer}{background} + \node[label=below:Alice, highlight, fit=(a) (working copy)] {}; + \end{pgfonlayer} + + \node<2>[repository, right=2cm of a] (repository) {}; + \draw<2>[short, ->] (a) to[bend left=10] node[above] {push} (repository); + \draw<2>[short, ->] (repository) to[bend left=10] node[below] {pull} (a); + \end{tikzpicture} +\end{frame}
--- a/mercurial.tex +++ b/mercurial.tex @@ -116,39 +116,9 @@ \include{merging} -\begin{frame}{Key Mercurial Commands} - Local commands: - \begin{itemize} - \item \cmd{hg commit}: save your changes in the current repository. - \item \cmd{hg update}: checkout revision into working directory. - \item \cmd{hg merge}: join different lines of history. - \end{itemize} - - Network commands: - \begin{itemize} - \item \cmd{hg pull}: retrieve changesets from another repository. - \item \cmd{hg push}: send your changesets to another repository. - \end{itemize} -\end{frame} +\include{key-commands} -\begin{frame}{Key Concepts} - \begin{tikzpicture} - \tikzstyle{repository}+=[minimum height=18mm, text width=15mm] - - \node[repository] (a) {}; - \node[working copy, left=2cm of a] (working copy) {hello.c\\Makefile}; - \draw[short, ->] (working copy) to[bend left=10] node[above] {commit} (a); - \draw[short, ->] (a) to[bend left=10] node[below] {update} (working copy); - - \begin{pgfonlayer}{background} - \node[label=below:Alice, highlight, fit=(a) (working copy)] {}; - \end{pgfonlayer} - - \node<2>[repository, right=2cm of a] (repository) {}; - \draw<2>[short, ->] (a) to[bend left=10] node[above] {push} (repository); - \draw<2>[short, ->] (repository) to[bend left=10] node[below] {pull} (a); - \end{tikzpicture} -\end{frame} +\include{key-concepts} \begin{frame}{Centralized Revision Control} Subversion uses a single server: