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