hgmerge.py in mainstream mercurial distribution

Arve Knudsen arve.knudsen at gmail.com
Tue Dec 11 06:43:45 CST 2007

On 12/11/07, dhruva <dhruvakm at gmail.com> wrote:
> Hi,
> On Dec 11, 2007 2:49 PM, Arve Knudsen <arve.knudsen at gmail.com> wrote:
> > We had a chat in #mercurial yesterday regarding what needs to be
> improved in
> > hgmerge.py to be considered for inclusion in mercurial proper. Based on
> that
> I cannot connect to IRC (firewall), hope someone could paste the
> proceedings regarding this topic in the #mercurial channel so that I
> can try to contribute.

There wasn't a whole lot that was said. The gist of it was that Matt
required that
hgmerge.py be simplified, made easy to extend with support for new tools
(perhaps defined from outside the Python code?)
and made configurable so that people can easily write merge handlers
e.g. for special file types (such as .doc).
That was my understanding anyway.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial-devel/attachments/20071211/10b1a7ca/attachment.htm 

More information about the Mercurial-devel mailing list