Mercurial > public > dvcs_intro_brownbag

changeset 6:bcc4d16e03e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Used "working directory" instead of "working copy". Other minor changes. Introduced push & pull earlier.
author Brian Neal <bgneal@gmail.com>
date Sun, 13 Nov 2011 13:55:53 -0600
parents b9801a668bff
children cb7409a6ae2d
files slides.rst
diffstat 1 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/slides.rst	Sat Nov 12 17:14:25 2011 -0600
+++ b/slides.rst	Sun Nov 13 13:55:53 2011 -0600
@@ -97,7 +97,7 @@
 .. 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.
+It is possible for all peers to exchange changes (via *push* and *pull* operations).
 
 ----
 
@@ -169,7 +169,7 @@
 Split Geography
 ===============
 
-- Imagine a team split between Cedar Rapids & Richardson
+- Imagine a team split between Cedar Rapids & Richardson...
 - With a CVS, you have to pick where to put the server
 - The remote location is stuck with network latency & associated problems
 - With a DVCS, each site can have a central repository
@@ -281,7 +281,7 @@
 =========================
 
 - Overview
-- Repositories & working copies
+- Repositories & working directories
 - Changesets
 - Branches & Tags
 - Example workflow
@@ -306,8 +306,8 @@
 
 ----
 
-Repositories & Working Copies
-=============================
+Repositories & Working Directories
+==================================
 
 A repository consists of two things:
 
@@ -321,6 +321,12 @@
    $ ls -A
    .hg  .hgignore  images/  slides.cfg  slides.css  slides.html  slides.rst
 
+- Repositories communicate via the *push* and *pull* commands
+
+  - Push & Pull do not affect your working directory
+  
+    - An *update* or *merge* must be performed to receive remote changes into your working directory
+
 ----
 
 What's in a Repository?
@@ -395,6 +401,12 @@
 
 .. image:: images/workflow3.png
 
+- Notice that after Alice's pull:
+  
+  - Her working directory is unaffected
+  - Her repository only has one head => no merging required
+  
+
 ----
 
 SVN Commands for Review