versionControl/exercises.rst
author Puneeth Chaganti <punchagan@fossee.in>
Sun, 30 Jan 2011 12:09:47 +0530
changeset 142 3b1c7aa6f807
parent 141 63fff1155f56
child 146 d1e3cf871f0a
permissions -rw-r--r--
vcs: Add title to exercises.rst The title is required for it to appear in the index file of sphinx.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
3b1c7aa6f807 vcs: Add title to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 141
diff changeset
     1
==============================
3b1c7aa6f807 vcs: Add title to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 141
diff changeset
     2
 Version Control -- Exercises
3b1c7aa6f807 vcs: Add title to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 141
diff changeset
     3
==============================
3b1c7aa6f807 vcs: Add title to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 141
diff changeset
     4
140
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
     5
1. Check out the repository from http://fossee.in:9000
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
     6
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
     7
#. Set your username and email id in you global user preferences. 
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
     8
141
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
     9
#. Add a copy of the folder, ``punchagan`` with your own name. The
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    10
   ``01-mercurial`` folder needs to have only ``questions.txt``. You need not
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    11
   copy the ``people.txt`` and ``story.txt`` file. Commit your changes with a
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    12
   meaningful commit message and push them.
140
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    13
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    14
#. Pull from the repo. Update. Use ``hg log`` to see the log history of the
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    15
   repository.
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    16
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    17
#. Answer the questions in ``questions.txt``. Commit your changes with a
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    18
   meaningful commit message and push them.
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    19
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    20
#. Wait for your neighbor to finish making his/her changes. Help him/her if
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    21
   required. Once both of you are ready, pull changes from the repository and
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    22
   update. 
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    23
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    24
   Now, add one question each, at the bottom of your own ``questions.txt``
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    25
   file and your neighbor's file. Preferably, the questions should be about
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    26
   ``hg`` , but you may, let your creativity run wild. ;) Commit the changes
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    27
   and push them. Resolve merge conflicts, as required.
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    28
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    29
#. Answer the new questions that were added by your neighbor, both to his/her
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    30
   file and your file. Commit changes. Push.
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    31
141
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    32
#. Edit the file ``people.txt`` in ``punchagan/01-mercurial`` . Add your
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    33
   name, followed by a colon, followed by a comma separated list of your
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    34
   interests. Commit your changes and push.
140
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    35
141
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    36
#. Edit the file ``story.txt`` in the folder ``punchagan/01-mercurial`` and
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    37
   add one sentence at the end of the present story. Commit your changes and
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    38
   push them. Wait until at least 3 other people change the file, before you
63fff1155f56 vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents: 140
diff changeset
    39
   make your next change. This can continue for as long as you like. ;)
140
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    40
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    41
.. 
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    42
   Local Variables:
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    43
   mode: rst
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    44
   indent-tabs-mode: nil
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    45
   sentence-end-double-space: nil
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    46
   fill-column: 77
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    47
   End:
67f06655e020 vcs: Add exercises.
Puneeth Chaganti <punchagan@fossee.in>
parents:
diff changeset
    48