# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1320807135 21600
# Node ID 0c3b42165692fcba2c2d78d9aeea947a79812195
# Parent  2fcab9db4f471fe7d40e08420f571ac68384af70
More work on the slides.

diff -r 2fcab9db4f47 -r 0c3b42165692 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Nov 08 20:52:15 2011 -0600
@@ -0,0 +1,4 @@
+syntax: glob
+*.pyc
+*.swp
+*.html
diff -r 2fcab9db4f47 -r 0c3b42165692 images/cvcs.png
Binary file images/cvcs.png has changed
diff -r 2fcab9db4f47 -r 0c3b42165692 images/dvcs.png
Binary file images/dvcs.png has changed
diff -r 2fcab9db4f47 -r 0c3b42165692 slides.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slides.cfg	Tue Nov 08 20:52:15 2011 -0600
@@ -0,0 +1,6 @@
+[landslide]
+source = slides.rst
+destination = slides.html
+css = slides.css
+relative = True
+linenos = inline
diff -r 2fcab9db4f47 -r 0c3b42165692 slides.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slides.css	Tue Nov 08 20:52:15 2011 -0600
@@ -0,0 +1,1 @@
+.strike { text-decoration: line-through; }
diff -r 2fcab9db4f47 -r 0c3b42165692 slides.rst
--- 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
+