1 

     2 Module 4: Version Control

     3 =========================

     4 

     5 Module Objectives

     6 -----------------

     7 

     8 After successfully completing this module a participant will be able to:

     9 	- Understand use of Version Control tools                            U

    10 	- Create and use repository for daily use of assignments/projects    Ap

    11 	- Browse exsiting repo, make changes and commit back                 Ap

    12 	- Work collaboratively with a team on live project                   Ap

    13 

    14 Suggested Reading:

    15 ------------------

    16 "http://mercurial.selenic.com/wiki/Tutorial"

    17 

    18 **Initial Session Plan**

    19 

    20 +---------+---------------------------------+---------+

    21 | Session | Topic  			    | Duration|

    22 +=========+=================================+=========+

    23 | 1	  | Introduction to Course          | 5 mts   |

    24 +---------+---------------------------------+---------+

    25 | 2	  | Why Revision Control?           | 10 mts  |

    26 |	  |	- Use case: for team	    |	      |

    27 |	  |	- Use case: for single dev  |	      |

    28 +---------+---------------------------------+---------+

    29 | 3       | Let there be Repository...	    | 15 mts  |

    30 |	  | 	- Creating Repositpry.	    |	      |     		

    31 |	  | 	- Cloning existing Repo.    |	      |		

    32 |	  |	- Branches concept 	    |         |

    33 +---------+---------------------------------+---------+

    34 | 4	  | Navigating through history logs | 5 mts   |

    35 +---------+---------------------------------+---------+

    36 | 5	  | Making changes in local branch  | 15 mts  |

    37 |	  |	- add	    		    |	      |

    38 |	  |	- cp			    |	      |

    39 |	  |	- rename		    |	      |  	

    40 |	  |	- rm			    |	      |	

    41 +---------+---------------------------------+---------+

    42 | 6	  | Sharing the changes		    | 10 mts  |

    43 |	  | 	- status		    |	      |

    44 |	  |	- pull			    |	      |

    45 |	  |	- update		    |	      |

    46 +---------+---------------------------------+---------+

    47 | 7	  | Merging the changes		    | 20 mts  |

    48 |	  | 	- commit		    |	      |

    49 |	  |	- glog			    |	      |

    50 |	  |	- push			    |	      |

    51 |	  |	- merge			    |	      |

    52 +---------+---------------------------------+---------+

    53 | 8	  | Handling conflicts during merge | 20 mts  |

    54 +---------+---------------------------------+---------+

    55 | 9	  | Exporting the changes: getting  |	      |

    56 |	  | patch, diff   	   	    | 10 mts  |

    57 +---------+---------------------------------+---------+

    58 

    59 *total session time = 110 mts*

    60 

    61 *buffer time = 10 mts*

    62