From 4a10bb18a6962aecdb3104315747ed24c1af65e2 Mon Sep 17 00:00:00 2001
From: Primal Pappachan
Date: Mon, 30 Jan 2012 08:20:28 +0530
Subject: Part 4 slides

---
 Version_Control/vcs4/vcslide4.tex | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'Version_Control')

diff --git a/Version_Control/vcs4/vcslide4.tex b/Version_Control/vcs4/vcslide4.tex
index fa0c0e5..52e67f1 100644
--- a/Version_Control/vcs4/vcslide4.tex
+++ b/Version_Control/vcs4/vcslide4.tex
@@ -221,9 +221,12 @@ In this tutorial, we have learnt to,
 \begin{frame}[fragile]
 \frametitle{Evaluation}
 \begin{enumerate}
-\item 
-\item 
-\item 
+\item Mention the easiest way to get started on sharing your repository by
+providing a web interface 
+\item Suppose Joey and Melissa have made simultaneous changes to the same file
+in their own systems. Would the output of hg parents before and after if one of
+them pulls in the changes and merges with it?
+\item  What are the commands involved in the process of merging changes? 
 \end{enumerate}
 \end{frame}
 
@@ -231,13 +234,24 @@ In this tutorial, we have learnt to,
 \begin{frame}
 \frametitle{Solutions}
 \begin{enumerate}
-\item 
-\item 
+\item hg serve
+\item No, whenever we've done a merge, hg parents will display two parents
+until we hg commit the results of the merge.
+\item hg pull, hg merge, hg commit -m "Merged Remote changes"
 \end{enumerate}
 \end{frame}
-\begin{frame}
 
 
+\begin{frame}
+\frametitle{Additional Reading}
+\begin{enumerate}
+\item .hgignore
+\item hg rollback
+\item hg bisect
+\item hg backout
+\end{enumerate}
+\end{frame}
+
 \begin{block}{}
   \begin{center}
   \textcolor{blue}{\Large THANK YOU!} 
-- 
cgit