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