Mercurial > public > dvcs_intro_brownbag
view slides.rst @ 0:2fcab9db4f47
Initial commit of the slides.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Mon, 07 Nov 2011 21:55:29 -0600 |
parents | |
children | 0c3b42165692 |
line wrap: on
line source
Introduction to Distributed Version Control with Mercurial ========================================================== ---- # whoami ======== Brian Neal <bgneal1@rockwellcollins.com> Started at Rockwell Collins in July 1999 Government Systems Programs: - UMS (July 1999 - Spring 2000) - Surgical Strike - (Spring - Fall 2000) - JTRS 2B - (Fall 2000 - Summer 2001) - SCAMP SEP - (Summer 2001 - October 2004) - TTNT (January 2005 - Present) ---- Brief History of Version Control Tools ====================================== First Generation ---------------- - No networking - Concurrency through locks only - Examples: - SCCS - 1972 - RCS - 1982 ---- Brief History of Version Control Tools ====================================== Second Generation ----------------- - Client/Server networking; CVCS (Centralized Version Control) - Merge before commit - Examples: - CVS - 1990 - IBM Rational ClearCase - 1992 - Visual SourceSafe - 1994 - Perforce - 1995 - SVN - 2000 ---- Brief History of Version Control Tools ====================================== Third Generation ---------------- - Distributed networking; DVCS (Distributed Version Control) - Merge before commit - Examples - Bitkeeper - 2000 - Darcs - 2003 - Monotone - 2003 - Git - 2005 - **Mercurial** - 2005 - Fossil - 2006 - Bazaar - 2007