diff slides.rst @ 3:0130da731f83

More work on the presentation.
author Brian Neal <bgneal@gmail.com>
date Thu, 10 Nov 2011 22:04:38 -0600
parents 802024c24c4e
children c9a18db51976
line wrap: on
line diff
--- a/slides.rst	Wed Nov 09 21:06:05 2011 -0600
+++ b/slides.rst	Thu Nov 10 22:04:38 2011 -0600
@@ -254,7 +254,7 @@
 - With a DVCS:
 
   - You make changes in your working copy
-  - You commit!
+  - You commit locally!
   - You can then choose to pull changes from others and merge
 
     - **Your changes are already safely tucked away and can be retrieved later if things go wrong**
@@ -284,16 +284,47 @@
 Introduction to Mercurial
 =========================
 
-- Command overview
 - Repositories & working copies
 - Changesets
 - Revisions, changesets, & heads
+- Command overview
 - Example workflow
 
 ----
 
-What is a CVCS Again?
-=====================
+Repositories & Working Copies
+=============================
+
+A repository consists of two things:
+
+- Your working copy (a directory tree of files)
+- The repository itself (also known as "the store")
+
+  - A .hg directory at the top of your working copy
+
+Example::
+
+   brian@gremmie:~/Documents/Rockwell/brownbags/dvcs/dvcs$ la
+   .hg  .hgignore  images/  slides.cfg  slides.css  slides.html  slides.rst
+
+----
+
+What's in a Repository?
+=======================
+
+A repository consists of a directed, acyclic graph of *changesets*
+
+.. image:: images/repos.png
+
+- Each changeset can have 0, 1, or 2 parents
+- A changeset with 0 parents is the root
+- A changeset with 2 parents is the result of a merge
+- The newest changeset is called the *tip*
+
+----
+
+SVN Commands for Review
+=======================
 
 Basic SVN commands:
 
@@ -305,8 +336,8 @@
 
 ----
 
-So what's a DVCS look like?
-===========================
+Mercurial Commands
+==================
 
 Mercurial (hg) vs SVN commands: