# HG changeset patch # User Brian Neal # Date 1320724529 21600 # Node ID 2fcab9db4f471fe7d40e08420f571ac68384af70 Initial commit of the slides. diff -r 000000000000 -r 2fcab9db4f47 slides.rst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slides.rst Mon Nov 07 21:55:29 2011 -0600 @@ -0,0 +1,72 @@ +Introduction to Distributed Version Control with Mercurial +========================================================== + +---- + +# whoami +======== + +Brian Neal + +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