diff --git a/img/git_logo.jpg b/img/git_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..81dd98862a6ac4b29747fd4107775ac59ed5a30e Binary files /dev/null and b/img/git_logo.jpg differ diff --git a/img/mercurial_logo.jpg b/img/mercurial_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b275cf1ada24b9ce73d95ffbe476fece7bdb2e50 Binary files /dev/null and b/img/mercurial_logo.jpg differ diff --git a/img/subversion_logo.jpg b/img/subversion_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e967745083d4308d1005c10e5944aef01898cc4d Binary files /dev/null and b/img/subversion_logo.jpg differ diff --git a/presentation.tex b/presentation.tex index a7ebaa194e654965e009b67e2b42787222c92ad3..ab52efdb0ccb4170782ede0d07ab1d5a43216699 100644 --- a/presentation.tex +++ b/presentation.tex @@ -17,10 +17,31 @@ \end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{VSC} +\section{Version Control System} \begin{frame} - \frametitle{} - + \frametitle{Version Control System (VSC)} + \begin{block}{VSC} +Version control is a system that records changes to a file or set of files over +time so that you can recall specific versions later. + \end{block} + \begin{itemize} + \item Make collaborative development easier + \item Are primarily meant to manage text files but can also handle binary + files (e.g. images). However do not track any generated files + \item Are \bf{not} adapted for managing backups! + \end{itemize} + \begin{columns} + \begin{column}{0.3\textwidth} + \includegraphics[width=1.1\textwidth]{./img/subversion_logo.jpg} + \end{column} + \begin{column}{0.3\textwidth} + \includegraphics[width=1.1\textwidth]{./img/git_logo.jpg} + \end{column} + \begin{column}{0.3\textwidth} + \includegraphics[width=0.6\textwidth]{./img/mercurial_logo.jpg} + \end{column} + \end{columns} +\end{frame} \end{frame} \end{document}