--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/versionControl/handOut.rst	Thu Aug 20 22:52:36 2009 +0530
@@ -0,0 +1,93 @@
+
+Version Control
+===============
+
+Introduction
+------------
+
+The following words are from a blogpost "http://karlagius.com/2009/01/09/version-control-for-the-masses/"
+
+"Version control is one of those weird, geeky things that never really gained much ground in non-geek fields, despite the fact that it’s blindingly useful.
+
+Version control (or source control) is nothing more arcane than keeping copies of ones work as one make changes to it. On the surface, it’s all straight-forward; make a copy of every file before making any changes to it. That way, if something seriously messes up, one can always fall back to something that worked before, or at least compare the broken copy with one that used to work so one can figure out where it went off kilter.Accidentally deleted half of thesis and closed the word processor? No problem – out comes the backup."
+
+Now, in the real world, it’s not so easy. One probably cooks up their own version control system without realizing it had such a geeky name. For instances files with names oldxxxxxx.odt and latestxxxxxx.odt. Every time to make some change in a file, one save it with different name then the original one. Luckily there are like, loads of version control systems out there to do this heavy lifting.
+
+Why Use Version Control
+-----------------------
+
+"Its the start which most people fail to attempt". 
+One of idea behind Version Control Tools was to save that "one" step, to build onto it, rather then simply lose it. So here are some reasons why is automated version control needed:
+
+    - It will track the history and evolution of a project, so one don't have to do it manually. It allows to track what changes where made, when were they made, by whom and why.
+    - For a team on people working on same project, revision control software makes it easier to collaborate. For example, when people more or less simultaneously make potentially incompatible changes, the software will help them to identify and resolve those conflicts.
+    - It can help to recover from mistakes. If a change made at some moment of time, turns out to be in error in future, one can revert to an earlier version of one or more files. In fact, a really good revision control tool will even help in efficiently figure out exactly when a problem was introduced.
+
+Most of these reasons are equally valid for the project having one man show, or hundred people. Beyond this, even it can be used to maintain assignments related to one particular subject/course, it will help manage things in way much better way. Rather use these tools for *resource management*. All codes, documents, presentation, assignments related to one course maintained in such a inventory,and one would never need (excuse)/(face the embarrassament), "I accendently deleted my all data!"(for those who have actually done that after completing assignments), and Internet hosting for version control will make the work immune to local hard-disk crash, unless hosting crashes itself.
+
+Some of Version Control Tools available and used widely are:
+
+     - cvs (Concurrent Version System)
+     - svn (Subversion)
+     - hg (Mercurial)
+     - bzr (Bazaar)
+     - git 
+
+Each of above mentioned tools have sets of feature which it offers in unique way. For this session we are going to concentrate on hg (mercurial). After covering the basics of hg, one can easily try other tools, and use what-ever he/she is most comfortable with.
+
+Learning the Lingo
+------------------
+
+Each Version Control uses its own nomenclature for more or less the same features. Here are some of terms which are going to used through out the rest of session:
+
+Basic Setup
+~~~~~~~~~~~
+
+     Repository(repo):
+	The database/folder storing the files.
+     Server:
+	The computer storing the repo.
+     Client:
+	The computer connecting to the repo.
+     Working Set/Working Copy:
+     	Your local directory of files, where you make changes. This is what is present on client side.
+     Trunk/Main:
+	The “primary” location for code in the repo. Think of code as a family tree — the “trunk” is the main line. This is generally what is present on server.
+
+Basic Actions
+~~~~~~~~~~~~~
+     
+     Add:
+	Put a file into the repo for the first time, i.e. begin tracking it with Version Control.
+     Revision:
+	What version a file is on.
+     Head:
+	The latest revision of the repo.
+     Check out:
+     	Initial download of repo onto machine.
+     Check in:
+     	Upload a file to repository(if it has changed). The file gets a new revision number, and people can “check out” the latest one.
+     Checkin Message:
+     	A short message describing what was changed.
+     Changelog/History:
+	A list of changes made to a file since it was created.
+     Update/Sync:
+	Synchronize local files with the latest from the repository on server. This get the latest revisions of all files.
+     Revert:
+	Throw away the local changes and reload the latest version from the repository.
+
+Advanced Actions:
+~~~~~~~~~~~~~~~~~
+
+     Branch:
+	Create a separate copy of a file/folder for private use (bug fixing, testing, etc).
+     Diff/Change:
+	Finding the differences between two files. Useful for seeing what changed between revisions.
+     Merge (or patch):
+     	Apply the changes from one file to another, to bring it up-to-date.
+     Conflict:
+	When pending changes to a file contradict each other (both changes cannot be applied).
+     Resolve:
+	Fixing the changes that contradict each other and checking in the correct version.
+     
+We should mention here what is distributing and centralised version control.

--- a/versionControl/versionControl.rst	Wed Aug 19 22:40:52 2009 +0530
+++ b/versionControl/versionControl.rst	Thu Aug 20 22:52:36 2009 +0530
@@ -1,4 +1,4 @@
-
+s
 Module 4: Version Control
 =========================
 
@@ -22,37 +22,39 @@
 +=========+=================================+=========+
 | 1	  | Introduction to Course          | 5 mts   |
 +---------+---------------------------------+---------+
-| 2	  | Why Revision Control?           | 10 mts  |
+| 2	  | Why Revision Control?           | 5 mts   |
 |	  |	- Use case: for team	    |	      |
 |	  |	- Use case: for single dev  |	      |
 +---------+---------------------------------+---------+
-| 3       | Let there be Repository...	    | 15 mts  |
+| 3	  | Learning the Lingo              | 5 mts   |
++---------+---------------------------------+---------+
+| 4       | Let there be Repository...	    | 15 mts  |
 |	  | 	- Creating Repositpry.	    |	      |     		
 |	  | 	- Cloning existing Repo.    |	      |		
 |	  |	- Branches concept 	    |         |
 +---------+---------------------------------+---------+
-| 4	  | Navigating through history logs | 5 mts   |
+| 5	  | Navigating through history logs | 5 mts   |
 +---------+---------------------------------+---------+
-| 5	  | Making changes in local branch  | 15 mts  |
+| 6	  | Making changes in local branch  | 15 mts  |
 |	  |	- add	    		    |	      |
 |	  |	- cp			    |	      |
 |	  |	- rename		    |	      |  	
 |	  |	- rm			    |	      |	
 +---------+---------------------------------+---------+
-| 6	  | Sharing the changes		    | 10 mts  |
+| 7	  | Sharing the changes		    | 10 mts  |
 |	  | 	- status		    |	      |
 |	  |	- pull			    |	      |
 |	  |	- update		    |	      |
 +---------+---------------------------------+---------+
-| 7	  | Merging the changes		    | 20 mts  |
+| 8	  | Merging the changes		    | 20 mts  |
 |	  | 	- commit		    |	      |
 |	  |	- glog			    |	      |
 |	  |	- push			    |	      |
 |	  |	- merge			    |	      |
 +---------+---------------------------------+---------+
-| 8	  | Handling conflicts during merge | 20 mts  |
+| 9	  | Handling conflicts during merge | 20 mts  |
 +---------+---------------------------------+---------+
-| 9	  | Exporting the changes: getting  |	      |
+| 10	  | Exporting the changes: getting  |	      |
 |	  | patch, diff   	   	    | 10 mts  |
 +---------+---------------------------------+---------+
 
@@ -60,3 +62,4 @@
 
 *buffer time = 10 mts*
 
+*For this course, working LAN is needed if Internet is not available.*