Be defensive... Re: A tale of user-friendliness with "hg merge" and "hg rollback".

[Tim Bell]

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.

I _always_ do the pull and subsequent merge in a disposable repository
created brand-new for that purpose.

1) Clone from your project master to some scratch area
2) Pull into 1) from your friend Mark's repository
3) Merge
4) If you like what you have, push it to your project master
5) If not, burn the disposable repository and start over

HTH -
Tim