author | Puneeth Chaganti <punchagan@fossee.in> |
Sun, 30 Jan 2011 11:38:24 +0530 | |
changeset 141 | 63fff1155f56 |
parent 140 | 67f06655e020 |
child 142 | 3b1c7aa6f807 |
permissions | -rw-r--r-- |
140 | 1 |
1. Check out the repository from http://fossee.in:9000 |
2 |
||
3 |
#. Set your username and email id in you global user preferences. |
|
4 |
||
141
63fff1155f56
vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents:
140
diff
changeset
|
5 |
#. 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
|
6 |
``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
|
7 |
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
|
8 |
meaningful commit message and push them. |
140 | 9 |
|
10 |
#. Pull from the repo. Update. Use ``hg log`` to see the log history of the |
|
11 |
repository. |
|
12 |
||
13 |
#. Answer the questions in ``questions.txt``. Commit your changes with a |
|
14 |
meaningful commit message and push them. |
|
15 |
||
16 |
#. Wait for your neighbor to finish making his/her changes. Help him/her if |
|
17 |
required. Once both of you are ready, pull changes from the repository and |
|
18 |
update. |
|
19 |
||
20 |
Now, add one question each, at the bottom of your own ``questions.txt`` |
|
21 |
file and your neighbor's file. Preferably, the questions should be about |
|
22 |
``hg`` , but you may, let your creativity run wild. ;) Commit the changes |
|
23 |
and push them. Resolve merge conflicts, as required. |
|
24 |
||
25 |
#. Answer the new questions that were added by your neighbor, both to his/her |
|
26 |
file and your file. Commit changes. Push. |
|
27 |
||
141
63fff1155f56
vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents:
140
diff
changeset
|
28 |
#. 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
|
29 |
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
|
30 |
interests. Commit your changes and push. |
140 | 31 |
|
141
63fff1155f56
vcs: Minor changes to exercises.rst
Puneeth Chaganti <punchagan@fossee.in>
parents:
140
diff
changeset
|
32 |
#. 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
|
33 |
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
|
34 |
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
|
35 |
make your next change. This can continue for as long as you like. ;) |
140 | 36 |
|
37 |
.. |
|
38 |
Local Variables: |
|
39 |
mode: rst |
|
40 |
indent-tabs-mode: nil |
|
41 |
sentence-end-double-space: nil |
|
42 |
fill-column: 77 |
|
43 |
End: |
|
44 |