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

[Adrian Buehlmann]

On 12.10.2009 23:23, Rob Landley wrote:
> Nor why it tries so hard to involve the current
> working store in pulling somebody else's repository.

I'll pick out this sentence to comment on.

"The current working store"

This term is a hint that you probably have some misunderstanding
of what a repository is and what the Mercurial's working directory is.

There is no such thing as a "working store" (although I'm wondering
if you might mean a clone here?).

If I may suggest to verify that your understanding of the following
two basic terms is in line with the respective wiki pages:

http://mercurial.selenic.com/wiki/Repository
http://mercurial.selenic.com/wiki/WorkingDirectory

Further important concepts are:

http://mercurial.selenic.com/wiki/Parent
http://mercurial.selenic.com/wiki/Tip

For a basic understanding see:

http://mercurial.selenic.com/wiki/UnderstandingMercurial

The latter contains an example with two users Alice and Bob doing
pulls and merges.

"pulling somebody else's repository" is not exactly correct,
as you do not pull a repository, you pull *from* a repository.

What you are pulling is *changesets*.