versionControl/versionControl.rst
author Madhusudan.C.S <madhusudancs@gmail.com>
Wed, 19 Aug 2009 22:40:52 +0530
changeset 3 f095fc984608
parent 2 33a89c36184e
child 7 eef24e2b0bac
permissions -rw-r--r--
Renaming the directory and file not to include spaces. Hopefully we follow this convension henceforth of not having spaces in file names or directory names and have all lower case letters in the names.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     1
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
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    25
| 2	  | Why Revision Control?           | 10 mts  |
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
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    29
| 3       | Let there be Repository...	    | 15 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    30
|	  | 	- Creating Repositpry.	    |	      |     		
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    31
|	  | 	- Cloning existing Repo.    |	      |		
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    32
|	  |	- Branches concept 	    |         |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    33
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    34
| 4	  | Navigating through history logs | 5 mts   |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    35
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    36
| 5	  | Making changes in local branch  | 15 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    37
|	  |	- add	    		    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    38
|	  |	- cp			    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    39
|	  |	- rename		    |	      |  	
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    40
|	  |	- rm			    |	      |	
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    41
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    42
| 6	  | Sharing the changes		    | 10 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    43
|	  | 	- status		    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    44
|	  |	- pull			    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    45
|	  |	- update		    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    46
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    47
| 7	  | Merging the changes		    | 20 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    48
|	  | 	- commit		    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    49
|	  |	- glog			    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    50
|	  |	- push			    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    51
|	  |	- merge			    |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    52
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    53
| 8	  | Handling conflicts during merge | 20 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    54
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    55
| 9	  | Exporting the changes: getting  |	      |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    56
|	  | patch, diff   	   	    | 10 mts  |
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    57
+---------+---------------------------------+---------+
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    58
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    59
*total session time = 110 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
*buffer time = 10 mts*
33a89c36184e Initial session plan for Version Control.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    62