From 497e83f5256ff30b53759dd31ff30a00e3c225c1 Mon Sep 17 00:00:00 2001 From: primalpop Date: Thu, 5 Jan 2012 13:41:49 +0530 Subject: Added objectives and summary to slides --- Version_Control/vcs2/vcslide2.tex | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'Version_Control') diff --git a/Version_Control/vcs2/vcslide2.tex b/Version_Control/vcs2/vcslide2.tex index a5cdd54..82e6b21 100644 --- a/Version_Control/vcs2/vcslide2.tex +++ b/Version_Control/vcs2/vcslide2.tex @@ -70,8 +70,8 @@ \label{sec-2} At the end of this session, you will be able to: \begin{itemize} - \item Make changes to a repository and commit them - \item + \item Learn how to view and revert changes made to files in a repository. + \item Learn how to share repositories and deal with simultaneous conflicting changes. \end{itemize} \end{frame} @@ -264,14 +264,20 @@ Spoken tutorial on - \frametitle{Summary} \label{sec-18} - In this tutorial, we have learnt to, - +In this tutorial, we have learnt to, \begin{itemize} -\item -\item -\item -\item +\item Undo changes to the repository using hg revert, +\item View changes done to the repository using hg diff +\item Use revision numbers as arguments to different hg commands +\item Clone repositories, using hg clone, +\item Serve our repositories via http using hg serve, +\item push changes to a repository using hg push, +\item check the changesets in a repository after last pull, using hg incoming, +\item pull changes from a repository using hg pull , +\item update the working directory, using hg update, +\item merge two heads, using hg merge, +\item and resolve conflicts using hg resolve. \end{itemize} \end{frame} \begin{frame}[fragile] -- cgit