Commit 03c7d924 authored by Lukas Nagel's avatar Lukas Nagel
Browse files

add graphics for fetch example

parent 92fc5684
...@@ -5,6 +5,9 @@ versionsgraph=\ ...@@ -5,6 +5,9 @@ versionsgraph=\
ex2-graph.pdf \ ex2-graph.pdf \
ex3-graph-premerge.pdf \ ex3-graph-premerge.pdf \
ex3-graph.pdf \ ex3-graph.pdf \
ex4-graph-prefetch.pdf \
ex4-graph-premerge.pdf \
ex4-graph.pdf \
merge-fast-forward-premerge.pdf \ merge-fast-forward-premerge.pdf \
merge-fast-forward.pdf \ merge-fast-forward.pdf \
merge-three-way-premerge.pdf \ merge-three-way-premerge.pdf \
......
\documentclass{standalone}
\input{theme}
\input{versiongraph}
\begin{document}
\begin{tikzpicture}[versionsgraph]
\commit{\rootcommit}{lightblue}{};
\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
\branch[right=of \proofcommit]{master}{\proofcommit}
\message{\rootcommit}{initial}
\message{\pepcommit}{pep8}
\message{\proofcommit}{create proof}
\HEAD{master}
\end{tikzpicture}
\end{document}
\documentclass{standalone}
\input{theme}
\input{versiongraph}
\begin{document}
\begin{tikzpicture}[versionsgraph]
\commit{\rootcommit}{lightblue}{};
\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
\commit[above right=of \pepcommit]{\sortcommit}{lightred}{\pepcommit};
\commit[right=of \sortcommit]{\refactorcommit}{lightred}{\sortcommit};
\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
\branch[right=of \proofcommit]{master}{\proofcommit}
\branch[above right=of \refactorcommit]{alice/master}{\refactorcommit}
\message{\rootcommit}{initial}
\message{\pepcommit}{pep8}
\message[above=of \sortcommit]{\sortcommit}{presort}
\message[above=of \refactorcommit]{\refactorcommit}{refactor}
\message{\proofcommit}{create proof}
\HEAD{master}
\end{tikzpicture}
\end{document}
\documentclass{standalone}
\input{theme}
\input{versiongraph}
\begin{document}
\begin{tikzpicture}[versionsgraph]
\commit{\rootcommit}{lightblue}{};
\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
\commit[above right=of \pepcommit]{\sortcommit}{lightred}{\pepcommit};
\commit[right=of \sortcommit]{\refactorcommit}{lightred}{\sortcommit};
\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
\commit[right=of \proofcommit, xshift=1.2cm]{\mergecommit}{lightblue}{\proofcommit,\refactorcommit};
\branch{master}{\mergecommit}
\branch[above right=of \refactorcommit]{alice/master}{\refactorcommit}
\message{\rootcommit}{initial}
\message{\pepcommit}{pep8}
\message[above=of \sortcommit]{\sortcommit}{presort}
\message[above=of \refactorcommit]{\refactorcommit}{refactor}
\message{\mergecommit}{merge alice/master into master}
\message{\proofcommit}{create proof}
\HEAD{master}
\end{tikzpicture}
\end{document}
...@@ -404,16 +404,19 @@ ...@@ -404,16 +404,19 @@
\subsection{Beispiel} \subsection{Beispiel}
\begin{frame} \begin{frame}
\frametitle{\subsecname} \frametitle{\subsecname}
Bob will Anderungen von Alice in sein lokales Repo einpflegen Bob will Änderungen von Alice in sein lokales Repo einpflegen
\begin{Beispiel} \begin{Beispiel}
\begin{commandline} \begin{commandline}
\visible<1->{\cmd{git remote add} alice \str{git.upb.de/alice/bogo}} & \\ \visible<1->{\cmd{git remote add} alice \str{git.upb.de/alice/bogo}} & \\
\visible<2->{\cmd{git fetch} alice master} & \\ \visible<2->{\cmd{git fetch} alice master} & \\
\visible<3->{\cmd{git merge} alice/master} & \\ \visible<3->{\cmd{git merge} alice/master} & \\
\end{commandline} \end{commandline}
\only<1>{\center{} {\huge \alert{Grafik: zustand}}} \center
\only<2>{\center{} {\huge \alert{Grafik: nach fetch}}} \begin{figure}
\only<3>{\center{} {\huge \alert{Grafik: nach merge}}} \only<1>{\includegraphics{../grafiken/ex4-graph-prefetch}}
\only<2>{\includegraphics{../grafiken/ex4-graph-premerge}}
\only<3>{\includegraphics{../grafiken/ex4-graph}}
\end{figure}
\end{Beispiel} \end{Beispiel}
\end{frame} \end{frame}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment