RFC: allow "hg merge" to take a URL argument, add autocommit option

[Daniel Santa Cruz]

On 6/20/06, Bryan O'Sullivan <bos at serpentine.com> wrote:
> I've been noticing that new users seem to have a hard time with
> Mercurial's model for merging changes, probably because there are too
> many steps involved.

I agree, but, as you mentioned, it will encourage people to be lazy
about checking the output of the merge before commiting.  I realize
that it is probably not the tools job to make sure that people user
their heads when doing this kind of things, but making it easy to do
the "wrong" (by some definition) thing seems a bit scary.

The automagically-merge-tools do a great job, but they have proven to
output "wrong" (again, by some def of wrong) final intances of files,
which don't really make sense (I guess I should try "the other" 3-way
merge).

I guess what I'm really trying to say is that making the merge a bit
more involved seems to bring out the fact that your files might not
have at the end of the process what you would expect them to have.
Reviewing the merge has proven very very valuable.

Anyway.
Daniel.