hgmerge.py in mainstream mercurial distribution

[Steve Borho]

On Mon, 2007-12-10 at 14:07 +0530, dhruva wrote:
> Hi,
>  Speaking from the M$ world, would it be a better idea to have Steve's
> hgmerge.py in the mainstream mercurial (as an extension)? Having a
> python solution instead of a shell variant would be a welcome move as
> we on M$ need not depend on a POSIX compliant UNIX shell. I like
> mercurial for various reasons and one being that it is fairly self
> contained.
>  Currently, I keep pulling changes from hgmerge's repo, I could do
> away with that if it were part of mainstream. Do let me know if
> something needs to be done to have it in the main repo or any other
> reasons why it is not advisable to have it in main repo.

It would be helpful if Mercurial allowed merge wrappers to be called as
python hooks.  I tried to add this myself a couple months ago, but it
was still above my python-fu at the time.

So far as inclusion goes, I know it violates the Mercurial coding
practices in many places and that it's still needlessly complex in
others.  It would greatly benefit from having many more eyes applied to
it.

I know Matt has reservations about including any merge wrappers, but he
can voice those concerns here himself.

-- 
Steve Borho (steve at borho.org)
http://www.borho.org/~steve/steve.asc
Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C