summaryrefslogtreecommitdiff
path: root/Version_Control
diff options
context:
space:
mode:
authorprimalpop2012-01-05 13:41:49 +0530
committerprimalpop2012-01-05 13:41:49 +0530
commit497e83f5256ff30b53759dd31ff30a00e3c225c1 (patch)
treebd1cfa8c80da382a58b216b72da714554d74db9c /Version_Control
parent2c3df1e9142f27a27577f8f75e6654a697d796a6 (diff)
downloadsdes-stscripts-497e83f5256ff30b53759dd31ff30a00e3c225c1.tar.gz
sdes-stscripts-497e83f5256ff30b53759dd31ff30a00e3c225c1.tar.bz2
sdes-stscripts-497e83f5256ff30b53759dd31ff30a00e3c225c1.zip
Added objectives and summary to slides
Diffstat (limited to 'Version_Control')
-rw-r--r--Version_Control/vcs2/vcslide2.tex22
1 files changed, 14 insertions, 8 deletions
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]