Merge Diff Extension

Na'Tosha Bard natosha at gmail.com
Sun Mar 11 03:24:51 CDT 2012


On Sat, Mar 10, 2012 at 9:53 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Sat, 2012-03-10 at 21:26 +0100, Na'Tosha Bard wrote:
> > Hello,
> >
> > I know this particular project seems currently unmaintained, but could we
> > consider something like
> > http://mercurial.selenic.com/wiki/MergediffExtensionfor core?
>
> Is this something people are actively using to review diffs?
>

We were before it got out of synch with the API and broke.  I keept an
internal fork up for awhile, but eventually dropped it due to time (and I
was keeping an internal fork of kbfiles up to date at the time).  I haven't
yet motivated myself to maintaining a 3rd party extension again after
Largefiles got made a bundled extension.

The more fundamental problem we need to solve is that merges cannot easily
be reviewed in their default form.  Perhaps there is a better way to "view"
what is interesting in a merge, other than the MergeDiff extension, but I
personally think it's pretty good.  If it were shipped with Mercurial (and
not 3rd party, and consequently breaking), code review tools would be a lot
more likely to present this "view" for merges, and humans could actually
review them.

Cheers,
Na'Tosha
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120311/4d024fb0/attachment.html>


More information about the Mercurial-devel mailing list