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

Andrea Arcangeli andrea at suse.de
Tue Jun 20 12:12:12 CDT 2006


On Tue, Jun 20, 2006 at 09:30:45AM -0700, Bryan O'Sullivan wrote:
> This doesn't reduce the functionality of "merge" in any way, but it
> eliminates two annoying steps and a visit to the editor.  For many

I also dislike the visit to the editor. However your suggestion doesn't
solve my problem it seems, because I've the default URL I pull from,
it's in the .hgrc file and I definitely don't want to type it by hand or
it's even slower than having to visit the editor (in the editor I write
"hg" or "svn" depending where I pulled from, an url is much longer).

Plus I want to review the diff before commit so I definitely can't use
your suggestion to avoid the visit to the editor at commit time.

Your -c command probably would work for Linus when he gets the url by
email from a trusted party to merge from.

Perhaps it would be ok to remove the comment request after merge and
just generate an empty commit. That would be ok with me, OTOH sometime
in more complex setups it may also be desiderable to have a special
merge comment. Dunno what's best...


More information about the Mercurial mailing list