summaryrefslogtreecommitdiff
path: root/versionControl/handOut.rst
diff options
context:
space:
mode:
authorShantanu Choudhary2009-08-21 00:20:24 +0530
committerShantanu Choudhary2009-08-21 00:20:24 +0530
commit4dd0ed8f1793991001b6ccd34d3623df8b1aac51 (patch)
tree840dcce3b1da10eb6f3000daa135bcda26130294 /versionControl/handOut.rst
parent288548265e94589689b635243d0a22cedeca5c4b (diff)
downloadsees-4dd0ed8f1793991001b6ccd34d3623df8b1aac51.tar.gz
sees-4dd0ed8f1793991001b6ccd34d3623df8b1aac51.tar.bz2
sees-4dd0ed8f1793991001b6ccd34d3623df8b1aac51.zip
Added CVCS and DVCS subsection.
Diffstat (limited to 'versionControl/handOut.rst')
-rw-r--r--versionControl/handOut.rst21
1 files changed, 20 insertions, 1 deletions
diff --git a/versionControl/handOut.rst b/versionControl/handOut.rst
index 4789196..008dc58 100644
--- a/versionControl/handOut.rst
+++ b/versionControl/handOut.rst
@@ -90,4 +90,23 @@ Advanced Actions:
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.
+Types of Version Control:
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Based on how source management is carried out in a tool there are two categories of Version Control Systems(VCS):
+
+ - Centralized VCS:
+ In this kind of system all the revision control functions are performed on a shared server. If two developers try to change the same file at the same time, without some method of managing access the developers may end up overwriting each other's work. Centralized revision control systems solve this problem in one of two different "source management models": file locking and version merging. Both svn and cvs follows this kind of management.
+
+ - Distributed VCS:
+ In a distributed model, every developer has their own repo. Diffs, commits, and reverts are all done locally, one needs Internet only to share the changes with others. It makes work faster, handles branching and merging in better way, with less management. hg, bzr and git uses this workflow.
+
+
+Suggested Reading:
+------------------
+
+ * http://karlagius.com/2009/01/09/version-control-for-the-masses/
+ * http://betterexplained.com/articles/a-visual-guide-to-version-control/
+ * http://en.wikipedia.org/wiki/Revision_control
+ * http://hgbook.red-bean.com/
+ * http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/