A tale of user-friendliness with "hg merge" and "hg rollback".

[Matt Mackall]

On Mon, 2009-10-12 at 15:06 -0500, Rob Landley wrote:
> My friend mark did a one-line commit in his repository, and it seemed safe to 
> pull it.  It was _one_line_.  This made his commit the "tip" of my repository, 
> obscuring the last half-dozen commits I'd done.

Reading the first few chapters of the book will save you a lot of pain.

http://hgbook.red-bean.com/read/

-- 
http://selenic.com : development and support for Mercurial and Linux