# HG changeset patch
# User Puneeth Chaganti <punchagan@fossee.in>
# Date 1296398831 -19800
# Node ID d1e3cf871f0a9324e8e6d67936ccadab752ddb44
# Parent  48747fbfe47aa4965433c51f1a41458b8c197854
vcs: Make exercise.rst more detailed.

The students were a little confused, because they didn't have an idea
of the big picture. Added more detail, attempting to show the big
picture.

diff -r 48747fbfe47a -r d1e3cf871f0a versionControl/exercises.rst
--- a/versionControl/exercises.rst	Sun Jan 30 20:15:30 2011 +0530
+++ b/versionControl/exercises.rst	Sun Jan 30 20:17:11 2011 +0530
@@ -2,20 +2,32 @@
  Version Control -- Exercises
 ==============================
 
-1. Check out the repository from http://fossee.in:9000
-
-#. Set your username and email id in you global user preferences. 
+1. ``clone`` the repository from http://fossee.in:9000 into a directory
+   called sees. You should see a folder ``punchagan`` with a lone directory
+   ``01-mercurial`` inside that. The ``log`` should show you the lone commit
+   of the repository. 
 
-#. Add a copy of the folder, ``punchagan`` with your own name. The
-   ``01-mercurial`` folder needs to have only ``questions.txt``. You need not
-   copy the ``people.txt`` and ``story.txt`` file. Commit your changes with a
-   meaningful commit message and push them.
+#. The next step is to create a folder for yourself inside the repository.
+   The idea is to create a central repository for the course, where every
+   participants files are put in his own folder (within a chapter
+   sub-folder). You are expected to commit future class-work to this
+   repository. 
+
+   Before beginning this exercise, set your username in you global ``hgrc`` 
+
+#. Create a new sub-folder (at the same level as ``punchagan`` with your
+   name.) Add ``01-mercurial`` as a sub-folder to it. Copy the
+   ``questions.txt`` from ``punchagan/01-mercurial`` to
+   ``<your-name>/01-mercurial``. Now, commit your changes with a meaningful
+   commit message and ``push`` . If ``push`` fails, ``pull`` , ``merge``,
+   ``commit`` and then ``push``.
 
 #. Pull from the repo. Update. Use ``hg log`` to see the log history of the
    repository.
 
 #. Answer the questions in ``questions.txt``. Commit your changes with a
-   meaningful commit message and push them.
+   meaningful commit message and push them. (If required, ``pull`` ,
+   ``merge``, ``commit`` and then ``push``)
 
 #. Wait for your neighbor to finish making his/her changes. Help him/her if
    required. Once both of you are ready, pull changes from the repository and