sttp/versionControl/versionControl.rst
changeset 0 27e1f5bd2774
equal deleted inserted replaced
-1:000000000000 0:27e1f5bd2774
       
     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       
       
    10   - Understand use of Version Control tools                            U
       
    11   - Create and use repository for daily use of assignments/projects    Ap
       
    12   - Browse exsiting repo, make changes and commit back                 Ap
       
    13   - Work collaboratively with a team on live project                   Ap
       
    14 
       
    15 Suggested Reading:
       
    16 ------------------
       
    17 "http://mercurial.selenic.com/wiki/Tutorial"
       
    18 
       
    19 **Initial Session Plan**
       
    20 
       
    21 +---------+---------------------------------+---------+
       
    22 | Session | Topic  			    | Duration|
       
    23 +=========+=================================+=========+
       
    24 | 1	  | Introduction to Course          | 5 mts   |
       
    25 +---------+---------------------------------+---------+
       
    26 | 2	  | Why Revision Control?           | 5 mts   |
       
    27 |	  |	- Use case: for team	    |	      |
       
    28 |	  |	- Use case: for single dev  |	      |
       
    29 +---------+---------------------------------+---------+
       
    30 | 3	  | Learning the Lingo              | 5 mts   |
       
    31 +---------+---------------------------------+---------+
       
    32 | 4       | Let there be Repository...	    | 15 mts  |
       
    33 |	  | 	- Creating Repositpry.	    |	      |     		
       
    34 |	  | 	- Cloning existing Repo.    |	      |		
       
    35 |	  |	- Branches concept 	    |         |
       
    36 +---------+---------------------------------+---------+
       
    37 | 5	  | Navigating through history logs | 5 mts   |
       
    38 +---------+---------------------------------+---------+
       
    39 | 6	  | Making changes in local branch  | 15 mts  |
       
    40 |	  |	- add	    		    |	      |
       
    41 |	  |	- cp			    |	      |
       
    42 |	  |	- rename		    |	      |  	
       
    43 |	  |	- rm			    |	      |	
       
    44 +---------+---------------------------------+---------+
       
    45 | 7	  | Sharing the changes		    | 10 mts  |
       
    46 |	  | 	- status		    |	      |
       
    47 |	  |	- pull			    |	      |
       
    48 |	  |	- update		    |	      |
       
    49 +---------+---------------------------------+---------+
       
    50 | 8	  | Merging the changes		    | 20 mts  |
       
    51 |	  | 	- commit		    |	      |
       
    52 |	  |	- glog			    |	      |
       
    53 |	  |	- push			    |	      |
       
    54 |	  |	- merge			    |	      |
       
    55 +---------+---------------------------------+---------+
       
    56 | 9	  | Handling conflicts during merge | 20 mts  |
       
    57 +---------+---------------------------------+---------+
       
    58 | 10	  | Exporting the changes: getting  |	      |
       
    59 |	  | patch, diff   	   	    | 10 mts  |
       
    60 +---------+---------------------------------+---------+
       
    61 
       
    62 *total session time = 110 mts*
       
    63 
       
    64 *buffer time = 10 mts*
       
    65 
       
    66 *For this course, working LAN is needed if Internet is not available.*