equal
deleted
inserted
replaced
1 1. Check out the repository from http://fossee.in:9000 |
1 1. Check out the repository from http://fossee.in:9000 |
2 |
2 |
3 #. Set your username and email id in you global user preferences. |
3 #. Set your username and email id in you global user preferences. |
4 |
4 |
5 #. Add a copy of the folder, ``punchagan`` with your own name. Commit your |
5 #. Add a copy of the folder, ``punchagan`` with your own name. The |
6 changes with a meaningful commit message and push them. |
6 ``01-mercurial`` folder needs to have only ``questions.txt``. You need not |
|
7 copy the ``people.txt`` and ``story.txt`` file. Commit your changes with a |
|
8 meaningful commit message and push them. |
7 |
9 |
8 #. Pull from the repo. Update. Use ``hg log`` to see the log history of the |
10 #. Pull from the repo. Update. Use ``hg log`` to see the log history of the |
9 repository. |
11 repository. |
10 |
12 |
11 #. Answer the questions in ``questions.txt``. Commit your changes with a |
13 #. Answer the questions in ``questions.txt``. Commit your changes with a |
21 and push them. Resolve merge conflicts, as required. |
23 and push them. Resolve merge conflicts, as required. |
22 |
24 |
23 #. Answer the new questions that were added by your neighbor, both to his/her |
25 #. Answer the new questions that were added by your neighbor, both to his/her |
24 file and your file. Commit changes. Push. |
26 file and your file. Commit changes. Push. |
25 |
27 |
26 #. Edit the file ``people.txt``. Add your name, followed by a colon, followed |
28 #. Edit the file ``people.txt`` in ``punchagan/01-mercurial`` . Add your |
27 by a comma separated list of your interests. Commit your changes and push. |
29 name, followed by a colon, followed by a comma separated list of your |
|
30 interests. Commit your changes and push. |
28 |
31 |
29 #. Edit the file ``story.txt`` in the folder ``punchagan`` and add one |
32 #. Edit the file ``story.txt`` in the folder ``punchagan/01-mercurial`` and |
30 sentence at the end of the present story. Commit your changes and push |
33 add one sentence at the end of the present story. Commit your changes and |
31 them. Wait until at least 3 other people change the file, before you make |
34 push them. Wait until at least 3 other people change the file, before you |
32 your next change. This can continue for as long as you like. ;) |
35 make your next change. This can continue for as long as you like. ;) |
33 |
36 |
34 .. |
37 .. |
35 Local Variables: |
38 Local Variables: |
36 mode: rst |
39 mode: rst |
37 indent-tabs-mode: nil |
40 indent-tabs-mode: nil |