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


Module 4: Version Control
=========================

Module Objectives
-----------------

After successfully completing this module a participant will be able to: ::
      
  - Understand use of Version Control tools                            U
  - Create and use repository for daily use of assignments/projects    Ap
  - Browse exsiting repo, make changes and commit back                 Ap
  - Work collaboratively with a team on live project                   Ap

Suggested Reading:
------------------
"http://mercurial.selenic.com/wiki/Tutorial"

**Initial Session Plan**

+---------+---------------------------------+---------+
| Session | Topic  			    | Duration|
+=========+=================================+=========+
| 1	  | Introduction to Course          | 10 mts  |
+---------+---------------------------------+---------+
| 2	  | Why Revision Control?           | 5 mts   |
|	  |	- Use case: for team	    |	      |
|	  |	- Use case: for single dev  |	      |
+---------+---------------------------------+---------+
| 3	  | Learning the Lingo              | 5 mts   |
+---------+---------------------------------+---------+
| 4       | Let there be Repository...	    | 15 mts  |
|	  | 	- Creating Repositpry.	    |	      |     		
|	  | 	- Cloning existing Repo.    |	      |		
|	  |	- Branches concept 	    |         |
+---------+---------------------------------+---------+
| 5	  | Navigating through history logs | 5 mts   |
+---------+---------------------------------+---------+
| 6	  | Making changes in local branch  | 15 mts  |
|	  |	- add	    		    |	      |
|	  |	- cp			    |	      |
|	  |	- rename		    |	      |  	
|	  |	- rm			    |	      |	
+---------+---------------------------------+---------+
| 7	  | Sharing the changes		    | 10 mts  |
|	  | 	- status		    |	      |
|	  |	- pull			    |	      |
|	  |	- update		    |	      |
+---------+---------------------------------+---------+
| 8	  | Merging the changes		    | 20 mts  |
|	  | 	- commit		    |	      |
|	  |	- glog			    |	      |
|	  |	- push			    |	      |
|	  |	- merge			    |	      |
+---------+---------------------------------+---------+
| 9	  | Handling conflicts during merge | 20 mts  |
+---------+---------------------------------+---------+
| 10	  | Exporting the changes: getting  |	      |
|	  | patch, diff   	   	    | 10 mts  |
+---------+---------------------------------+---------+

*total session time = 110 mts*

*buffer time = 10 mts*

*For this course, working LAN is needed if Internet is not available.*