[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: [ANN] python based merge scripts
From:       Steve Borho <steve () borho ! org>
Date:       2007-09-26 2:00:35
Message-ID: 1190772035.17528.21.camel () marvin ! borho ! org
[Download RAW message or body]

On Mon, 2007-09-24 at 08:21 -0500, Steve Borho wrote:
> On Mon, 2007-09-24 at 08:44 +0200, Patrick Mézard wrote:
> > Steve Borho a écrit :
> > > Since kdiff3 has an '--auto' option, it is considered both
> > > non-interactive and interactive.  On Windows, it's likely the only
> > > non-interactive tool you'll have.
> > 
> > You may try "contrib/simplemerge" on last resort.
> 
> Yes, that will do in a pinch.  The hardest part will be finding where it
> was installed.

I did a large refactor of hgmerge.py today.  I got rid of the collection
of wrapper scripts and pulled everything into hgmerge.py proper,
implementing the detect and run wrappers as class methods.   The impetus
behind this was from trying to integrate the scripts into the py2exe
based Windows installer.  Having a dozen separate executable scripts was
too unwieldy.

While I was at it I wrote some utility functions for fixing up EOL
problems which seem to be common with many merge tools (writing merge
output in the native text format, rather than in the eol style of the
input files).  Many of the wrappers now use these functions to clean up
after themselves.

The result can be found here:  http://hg.borho.org/hgmerge

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


_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial

[prev in list] [next in list] [prev in thread] [next in thread]