| author | Shantanu <shantanu@fossee.in> |
| Thu, 20 Aug 2009 22:52:36 +0530 | |
| changeset 7 | eef24e2b0bac |
| parent 2 | 33a89c36184e |
| child 14 | e0dc3f0ad2f6 |
| permissions | -rw-r--r-- |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
1 |
s |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
2 |
Module 4: Version Control |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
3 |
========================= |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
4 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
5 |
Module Objectives |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
6 |
----------------- |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
7 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
8 |
After successfully completing this module a participant will be able to: |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
9 |
- Understand use of Version Control tools U |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
10 |
- Create and use repository for daily use of assignments/projects Ap |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
11 |
- Browse exsiting repo, make changes and commit back Ap |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
12 |
- Work collaboratively with a team on live project Ap |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
13 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
14 |
Suggested Reading: |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
15 |
------------------ |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
16 |
"http://mercurial.selenic.com/wiki/Tutorial" |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
17 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
18 |
**Initial Session Plan** |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
19 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
20 |
+---------+---------------------------------+---------+ |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
21 |
| Session | Topic | Duration| |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
22 |
+=========+=================================+=========+ |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
23 |
| 1 | Introduction to Course | 5 mts | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
24 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
25 |
| 2 | Why Revision Control? | 5 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
26 |
| | - Use case: for team | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
27 |
| | - Use case: for single dev | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
28 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
29 |
| 3 | Learning the Lingo | 5 mts | |
|
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
30 |
+---------+---------------------------------+---------+ |
|
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
31 |
| 4 | Let there be Repository... | 15 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
32 |
| | - Creating Repositpry. | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
33 |
| | - Cloning existing Repo. | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
34 |
| | - Branches concept | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
35 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
36 |
| 5 | Navigating through history logs | 5 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
37 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
38 |
| 6 | Making changes in local branch | 15 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
39 |
| | - add | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
40 |
| | - cp | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
41 |
| | - rename | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
42 |
| | - rm | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
43 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
44 |
| 7 | Sharing the changes | 10 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
45 |
| | - status | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
46 |
| | - pull | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
47 |
| | - update | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
48 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
49 |
| 8 | Merging the changes | 20 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
50 |
| | - commit | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
51 |
| | - glog | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
52 |
| | - push | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
53 |
| | - merge | | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
54 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
55 |
| 9 | Handling conflicts during merge | 20 mts | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
56 |
+---------+---------------------------------+---------+ |
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
57 |
| 10 | Exporting the changes: getting | | |
|
2
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
58 |
| | patch, diff | 10 mts | |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
59 |
+---------+---------------------------------+---------+ |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
60 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
61 |
*total session time = 110 mts* |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
62 |
|
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
63 |
*buffer time = 10 mts* |
|
33a89c36184e
Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff
changeset
|
64 |
|
|
7
eef24e2b0bac
Hand out doc for version contol added.
Shantanu <shantanu@fossee.in>
parents:
2
diff
changeset
|
65 |
*For this course, working LAN is needed if Internet is not available.* |