A handy workflow image for newbie mercurial users

I've been using mercurial lately for my own projects and when collaborating with OJ on a skunkwork project we have underway.

Here's a cheatsheet I built, lifted almost wholly from hginit, to help my get my rhythm in the early days.

As soon as Jeff 'VB forever' Atwood adopts a technology, you know it's gone all mainstream... but just to prove that hg has really jumped the critical-adoption-long-tail-shark-mass... I built the above image with powerpoint. Yes, that powerpoint.

--> Full size image here <--

Source pptx is zipped here.

If you've got any improvements or feedback, please comment.

'git' on Wed, 28 Apr 2010 12:44:46 GMT, sez:

git. No excuse.

'Don2' on Wed, 28 Apr 2010 12:49:36 GMT, sez:

Not Bad lb, but here's my favorite cheat sheet:

http://sunoano.name/misc/mm/si/content/cheat_sheet.jpg

And also your VSS cheat sheet isn't bad.

Also, take a look what Tufte says about Powerpoint. Look it up.

'Ed Brannin' on Wed, 28 Apr 2010 13:48:07 GMT, sez:

@git: TortoiseHg, relative Windows-hostility. Two decent excuses.

@Secretgeek: The .pptx link is broken.

'James McKay' on Wed, 28 Apr 2010 13:51:08 GMT, sez:

@git: "git. No excuse."

Sigh. Why is it that every time anyone mentions Mercurial, the git fanboys jump on board with cries of "my DVCS is better than yours?"

Pragmatic programmers are happy with either.

'foo' on Wed, 28 Apr 2010 13:59:03 GMT, sez:

Nice! But for some reason, I see so many diagrams like this one that simply ignore the steps one has to take when the merge has a conflict: not that it's hard to handle, but I find it just as important as the rest of the workflow.

'lb' on Wed, 28 Apr 2010 14:20:45 GMT, sez:

@foo -- so give us an improved version. i'll merge it in!

@James, don't let em git to you.

@Ed, i've zipped the pptx... i think my host has a problem supplying .pptx files. they are increasingly weird people.

'OJ' on Thu, 13 May 2010 11:37:47 GMT, sez:

You can do the first two steps in one command if you like:

hg pull -u

'Chris Tavares' on Tue, 07 Sep 2010 02:03:23 GMT, sez:

I'd recommend seriously considering hg rebase intead of hg merge, but otherwise very nice!

name


website (optional)


enter the word:
 

comment (HTML not allowed)

All viewpoints welcome. But the right to delete any post for any reason is reserved. Don't make me do it. Comments may be republished, emailed to your loved ones or printed and used as toilet paper. Who reads this legal bit anyhow?

TimeSnapper_{Know thyself!}

TimeSnapper is a life analysis system that stores and plays-back your computer use. It makes timesheet recording a breeze, helps you recover lost work and shows you how to sharpen your act.

TimeSnapper won last year's Developer Competition at Larkware.com, and is used by over 10,000 people.