# HG changeset patch # User Brian Neal # Date 1321139665 21600 # Node ID b9801a668bff7e8fd3d9cf56ff3058e260f95d9f # Parent c9a18db5197695afdb371a2e61f91587b376e5e1 Created an overview for Mercurial slide. Other minor tweaks. diff -r c9a18db51976 -r b9801a668bff slides.rst --- a/slides.rst Sat Nov 12 14:49:09 2011 -0600 +++ b/slides.rst Sat Nov 12 17:14:25 2011 -0600 @@ -20,7 +20,7 @@ Started at Rockwell Collins in July 1999 -Perhaps you've recognized me from the following programs: +You might remember me from the following programs: - UMS (July 1999 - Spring 2000) - Surgical Strike - (Spring - Fall 2000) @@ -280,6 +280,7 @@ Introduction to Mercurial ========================= +- Overview - Repositories & working copies - Changesets - Branches & Tags @@ -288,6 +289,23 @@ ---- +Mercurial Overview +================== + +- Distributed Version Control System +- Free, open source software licensed under GPL Version 2 +- Available for Microsoft Windows, GNU/Linux, Mac OS X, Solaris 11 Express +- Written in Python with a small amount of C +- Extensible with official and 3rd party extensions +- TortoiseHg is a popular GUI for Windows +- Reputation for being fast & easy to get started with +- Can be served via Apache Web server +- Repository hooks +- Integrates with Trac +- Can import history from other tools, including Subversion + +---- + Repositories & Working Copies ============================= @@ -405,9 +423,8 @@ Additional "distributed commands": -- clone, push, pull -- incoming, outgoing -- serve +- **clone**, **push**, **pull** +- **incoming**, **outgoing** **Not a whole lot to learn above SVN** @@ -422,6 +439,10 @@ - Hg Init: A Mercurial Tutorial http://hginit.com - Version Control By Example (free!) http://www.ericsink.com/vcbe/ +This presentation is available at:: + + $ hg clone https://bitbucket.org/bgneal/dvcs_intro_brownbag + ---- Questions?