diff -r dccb80025455 -r 33a89c36184e versionControl/versionControl.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/versionControl/versionControl.rst	Tue Aug 18 17:09:58 2009 +0530
@@ -0,0 +1,62 @@
+
+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          | 5 mts   |
++---------+---------------------------------+---------+
+| 2	  | Why Revision Control?           | 10 mts  |
+|	  |	- Use case: for team	    |	      |
+|	  |	- Use case: for single dev  |	      |
++---------+---------------------------------+---------+
+| 3       | Let there be Repository...	    | 15 mts  |
+|	  | 	- Creating Repositpry.	    |	      |     		
+|	  | 	- Cloning existing Repo.    |	      |		
+|	  |	- Branches concept 	    |         |
++---------+---------------------------------+---------+
+| 4	  | Navigating through history logs | 5 mts   |
++---------+---------------------------------+---------+
+| 5	  | Making changes in local branch  | 15 mts  |
+|	  |	- add	    		    |	      |
+|	  |	- cp			    |	      |
+|	  |	- rename		    |	      |  	
+|	  |	- rm			    |	      |	
++---------+---------------------------------+---------+
+| 6	  | Sharing the changes		    | 10 mts  |
+|	  | 	- status		    |	      |
+|	  |	- pull			    |	      |
+|	  |	- update		    |	      |
++---------+---------------------------------+---------+
+| 7	  | Merging the changes		    | 20 mts  |
+|	  | 	- commit		    |	      |
+|	  |	- glog			    |	      |
+|	  |	- push			    |	      |
+|	  |	- merge			    |	      |
++---------+---------------------------------+---------+
+| 8	  | Handling conflicts during merge | 20 mts  |
++---------+---------------------------------+---------+
+| 9	  | Exporting the changes: getting  |	      |
+|	  | patch, diff   	   	    | 10 mts  |
++---------+---------------------------------+---------+
+
+*total session time = 110 mts*
+
+*buffer time = 10 mts*
+