Mercurial > public > dvcs_intro_brownbag
diff slides.rst @ 1:0c3b42165692
More work on the slides.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Tue, 08 Nov 2011 20:52:15 -0600 |
parents | 2fcab9db4f47 |
children | 802024c24c4e |
line wrap: on
line diff
--- a/slides.rst Mon Nov 07 21:55:29 2011 -0600 +++ b/slides.rst Tue Nov 08 20:52:15 2011 -0600 @@ -1,8 +1,22 @@ +.. role:: strike + :class: strike + Introduction to Distributed Version Control with Mercurial ========================================================== ---- +(Sublimal Message) +================== + +(We should be using this at work... ) +------------------------------------- + +(Seriously... ) + +---- + + # whoami ======== @@ -10,7 +24,7 @@ Started at Rockwell Collins in July 1999 -Government Systems Programs: +Perhaps you've recognized me from the following programs: - UMS (July 1999 - Spring 2000) - Surgical Strike - (Spring - Fall 2000) @@ -26,8 +40,8 @@ First Generation ---------------- -- No networking -- Concurrency through locks only +- No networking! +- Concurrency method: locks - Examples: - SCCS - 1972 @@ -42,7 +56,7 @@ ----------------- - Client/Server networking; CVCS (Centralized Version Control) -- Merge before commit +- Concurrency method: merge before commit - Examples: - CVS - 1990 @@ -60,8 +74,8 @@ ---------------- - Distributed networking; DVCS (Distributed Version Control) -- Merge before commit -- Examples +- Concurrency method: commit then merge +- Examples: - Bitkeeper - 2000 - Darcs - 2003 @@ -70,3 +84,54 @@ - **Mercurial** - 2005 - Fossil - 2006 - Bazaar - 2007 + - Veracity - 2011 + +---- + +What is a CVCS Again? +===================== + +.. image:: images/cvcs.png + +---- + +What is a CVCS Again? +===================== + +Basic SVN commands: + +- add, remove, copy, move, mkdir +- checkout, commit, update, revert +- merge, resolved, diff +- status +- lock, unlock + +---- + +So what's a DVCS look like? +=========================== + +.. image:: images/dvcs.png + +All repositories are peers. By convention only, one repository is designated the master. +It is possible for all peers to exchange changes. + +---- + +So what's a DVCS look like? +=========================== + +Mercurial (hg) vs SVN commands: + +- add, remove, copy, move, :strike:`mkdir` +- :strike:`checkout`, commit, update, revert +- merge, resolve, diff +- status +- :strike:`lock, unlock` + +Additional "distributed commands": + +- clone, push, pull +- incoming, outgoing +- serve +