Mercurial > public > dvcs_intro_brownbag

comparison slides.rst @ 5:b9801a668bff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Created an overview for Mercurial slide. Other minor tweaks.
author Brian Neal <bgneal@gmail.com>
date Sat, 12 Nov 2011 17:14:25 -0600
parents c9a18db51976
children bcc4d16e03e8
comparison
equal deleted inserted replaced
4:c9a18db51976 5:b9801a668bff
18 18
19 Brian Neal <bgneal1@rockwellcollins.com> 19 Brian Neal <bgneal1@rockwellcollins.com>
20 20
21 Started at Rockwell Collins in July 1999 21 Started at Rockwell Collins in July 1999
22 22
23 Perhaps you've recognized me from the following programs: 23 You might remember me from the following programs:
24 24
25 - UMS (July 1999 - Spring 2000) 25 - UMS (July 1999 - Spring 2000)
26 - Surgical Strike - (Spring - Fall 2000) 26 - Surgical Strike - (Spring - Fall 2000)
27 - JTRS 2B - (Fall 2000 - Summer 2001) 27 - JTRS 2B - (Fall 2000 - Summer 2001)
28 - SCAMP SEP - (Summer 2001 - October 2004) 28 - SCAMP SEP - (Summer 2001 - October 2004)
278 ---- 278 ----
279 279
280 Introduction to Mercurial 280 Introduction to Mercurial
281 ========================= 281 =========================
282 282
283 - Overview
283 - Repositories & working copies 284 - Repositories & working copies
284 - Changesets 285 - Changesets
285 - Branches & Tags 286 - Branches & Tags
286 - Example workflow 287 - Example workflow
287 - Command overview 288 - Command overview
289
290 ----
291
292 Mercurial Overview
293 ==================
294
295 - Distributed Version Control System
296 - Free, open source software licensed under GPL Version 2
297 - Available for Microsoft Windows, GNU/Linux, Mac OS X, Solaris 11 Express
298 - Written in Python with a small amount of C
299 - Extensible with official and 3rd party extensions
300 - TortoiseHg is a popular GUI for Windows
301 - Reputation for being fast & easy to get started with
302 - Can be served via Apache Web server
303 - Repository hooks
304 - Integrates with Trac
305 - Can import history from other tools, including Subversion
288 306
289 ---- 307 ----
290 308
291 Repositories & Working Copies 309 Repositories & Working Copies
292 ============================= 310 =============================
403 - status, log 421 - status, log
404 - :strike:`lock, unlock` 422 - :strike:`lock, unlock`
405 423
406 Additional "distributed commands": 424 Additional "distributed commands":
407 425
408 - clone, push, pull 426 - **clone**, **push**, **pull**
409 - incoming, outgoing 427 - **incoming**, **outgoing**
410 - serve
411 428
412 **Not a whole lot to learn above SVN** 429 **Not a whole lot to learn above SVN**
413 430
414 ---- 431 ----
415 432
420 - Mercurial Wiki http://mercurial.selenic.com/wiki/ 437 - Mercurial Wiki http://mercurial.selenic.com/wiki/
421 - Mercurial Book (free!) http://hgbook.red-bean.com/ 438 - Mercurial Book (free!) http://hgbook.red-bean.com/
422 - Hg Init: A Mercurial Tutorial http://hginit.com 439 - Hg Init: A Mercurial Tutorial http://hginit.com
423 - Version Control By Example (free!) http://www.ericsink.com/vcbe/ 440 - Version Control By Example (free!) http://www.ericsink.com/vcbe/
424 441
442 This presentation is available at::
443
444 $ hg clone https://bitbucket.org/bgneal/dvcs_intro_brownbag
445
425 ---- 446 ----
426 447
427 Questions? 448 Questions?
428 ========== 449 ==========
429 450