Mercurial > public > dvcs_intro_brownbag

comparison slides.rst @ 0:2fcab9db4f47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial commit of the slides.
author Brian Neal <bgneal@gmail.com>
date Mon, 07 Nov 2011 21:55:29 -0600
parents
children 0c3b42165692
comparison
equal deleted inserted replaced
-1:000000000000 0:2fcab9db4f47
1 Introduction to Distributed Version Control with Mercurial
2 ==========================================================
3
4 ----
5
6 # whoami
7 ========
8
9 Brian Neal <bgneal1@rockwellcollins.com>
10
11 Started at Rockwell Collins in July 1999
12
13 Government Systems Programs:
14
15 - UMS (July 1999 - Spring 2000)
16 - Surgical Strike - (Spring - Fall 2000)
17 - JTRS 2B - (Fall 2000 - Summer 2001)
18 - SCAMP SEP - (Summer 2001 - October 2004)
19 - TTNT (January 2005 - Present)
20
21 ----
22
23 Brief History of Version Control Tools
24 ======================================
25
26 First Generation
27 ----------------
28
29 - No networking
30 - Concurrency through locks only
31 - Examples:
32
33 - SCCS - 1972
34 - RCS - 1982
35
36 ----
37
38 Brief History of Version Control Tools
39 ======================================
40
41 Second Generation
42 -----------------
43
44 - Client/Server networking; CVCS (Centralized Version Control)
45 - Merge before commit
46 - Examples:
47
48 - CVS - 1990
49 - IBM Rational ClearCase - 1992
50 - Visual SourceSafe - 1994
51 - Perforce - 1995
52 - SVN - 2000
53
54 ----
55
56 Brief History of Version Control Tools
57 ======================================
58
59 Third Generation
60 ----------------
61
62 - Distributed networking; DVCS (Distributed Version Control)
63 - Merge before commit
64 - Examples
65
66 - Bitkeeper - 2000
67 - Darcs - 2003
68 - Monotone - 2003
69 - Git - 2005
70 - **Mercurial** - 2005
71 - Fossil - 2006
72 - Bazaar - 2007