Merge Diff Extension

[Na'Tosha Bard]

On Sun, Mar 11, 2012 at 8:40 PM, Matt Mackall <mpm at selenic.com> wrote:

>
>
> I agree. The theory behind this extension is.. a little fuzzy but
> basically ok. But I would frankly tweak the output to be less diff-like
> (there's no chance in hell it'll ever work with patch) and more
> user-friendly.
>

I do agree the output in particular is a little wonky.  I'll try a few
things and see what I can come up with and send some ideas and example
output.  Not sure yet really if it's best to take this extension and run
with it and start something completely different because I haven't really
spent much time looking at the code, and what was many months ago.

As always with third-party extensions, we're going to need the
> third-party to sign off on inclusion, and someone to take responsibility
> for pushing the inclusion and ongoing maintenance.


If we go with pushing this particular extension, I will try and get a hold
of the maintainer about it.  In any case I will be responsible for pushing
the inclusion and the maintenance, because I believe this is an area where
we have a gaping hole in terms  of usability for large teams/projects.

Cheers,
Na'Tsoha
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20120311/f3471318/attachment-0002.html>