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

[Matt Mackall]

On Tue, Jun 20, 2006 at 09:24:21PM +0000, Daniel Santa Cruz wrote:
> 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.

Most of the problem seems to be about remembering where you pulled
from so that you can have a nice default in your commit message.

-- 
Mathematics is the supreme nostalgia of our time.