Mercurial > public > dvcs_intro_brownbag

comparison slides.rst @ 1:0c3b42165692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on the slides.
author Brian Neal <bgneal@gmail.com>
date Tue, 08 Nov 2011 20:52:15 -0600
parents 2fcab9db4f47
children 802024c24c4e
comparison
equal deleted inserted replaced
0:2fcab9db4f47 1:0c3b42165692
1 .. role:: strike
2 :class: strike
3
1 Introduction to Distributed Version Control with Mercurial 4 Introduction to Distributed Version Control with Mercurial
2 ========================================================== 5 ==========================================================
3 6
4 ---- 7 ----
8
9 (Sublimal Message)
10 ==================
11
12 (We should be using this at work... )
13 -------------------------------------
14
15 (Seriously... )
16
17 ----
18
5 19
6 # whoami 20 # whoami
7 ======== 21 ========
8 22
9 Brian Neal <bgneal1@rockwellcollins.com> 23 Brian Neal <bgneal1@rockwellcollins.com>
10 24
11 Started at Rockwell Collins in July 1999 25 Started at Rockwell Collins in July 1999
12 26
13 Government Systems Programs: 27 Perhaps you've recognized me from the following programs:
14 28
15 - UMS (July 1999 - Spring 2000) 29 - UMS (July 1999 - Spring 2000)
16 - Surgical Strike - (Spring - Fall 2000) 30 - Surgical Strike - (Spring - Fall 2000)
17 - JTRS 2B - (Fall 2000 - Summer 2001) 31 - JTRS 2B - (Fall 2000 - Summer 2001)
18 - SCAMP SEP - (Summer 2001 - October 2004) 32 - SCAMP SEP - (Summer 2001 - October 2004)
24 ====================================== 38 ======================================
25 39
26 First Generation 40 First Generation
27 ---------------- 41 ----------------
28 42
29 - No networking 43 - No networking!
30 - Concurrency through locks only 44 - Concurrency method: locks
31 - Examples: 45 - Examples:
32 46
33 - SCCS - 1972 47 - SCCS - 1972
34 - RCS - 1982 48 - RCS - 1982
35 49
40 54
41 Second Generation 55 Second Generation
42 ----------------- 56 -----------------
43 57
44 - Client/Server networking; CVCS (Centralized Version Control) 58 - Client/Server networking; CVCS (Centralized Version Control)
45 - Merge before commit 59 - Concurrency method: merge before commit
46 - Examples: 60 - Examples:
47 61
48 - CVS - 1990 62 - CVS - 1990
49 - IBM Rational ClearCase - 1992 63 - IBM Rational ClearCase - 1992
50 - Visual SourceSafe - 1994 64 - Visual SourceSafe - 1994
58 72
59 Third Generation 73 Third Generation
60 ---------------- 74 ----------------
61 75
62 - Distributed networking; DVCS (Distributed Version Control) 76 - Distributed networking; DVCS (Distributed Version Control)
63 - Merge before commit 77 - Concurrency method: commit then merge
64 - Examples 78 - Examples:
65 79
66 - Bitkeeper - 2000 80 - Bitkeeper - 2000
67 - Darcs - 2003 81 - Darcs - 2003
68 - Monotone - 2003 82 - Monotone - 2003
69 - Git - 2005 83 - Git - 2005
70 - **Mercurial** - 2005 84 - **Mercurial** - 2005
71 - Fossil - 2006 85 - Fossil - 2006
72 - Bazaar - 2007 86 - Bazaar - 2007
87 - Veracity - 2011
88
89 ----
90
91 What is a CVCS Again?
92 =====================
93
94 .. image:: images/cvcs.png
95
96 ----
97
98 What is a CVCS Again?
99 =====================
100
101 Basic SVN commands:
102
103 - add, remove, copy, move, mkdir
104 - checkout, commit, update, revert
105 - merge, resolved, diff
106 - status
107 - lock, unlock
108
109 ----
110
111 So what's a DVCS look like?
112 ===========================
113
114 .. image:: images/dvcs.png
115
116 All repositories are peers. By convention only, one repository is designated the master.
117 It is possible for all peers to exchange changes.
118
119 ----
120
121 So what's a DVCS look like?
122 ===========================
123
124 Mercurial (hg) vs SVN commands:
125
126 - add, remove, copy, move, :strike:`mkdir`
127 - :strike:`checkout`, commit, update, revert
128 - merge, resolve, diff
129 - status
130 - :strike:`lock, unlock`
131
132 Additional "distributed commands":
133
134 - clone, push, pull
135 - incoming, outgoing
136 - serve
137