Merge Diff Extension

Matt Mackall mpm at selenic.com
Mon Mar 12 07:25:21 CDT 2012


On Mon, 2012-03-12 at 12:50 +0100, Na'Tosha Bard wrote:
> On Sun, Mar 11, 2012 at 8:40 PM, Matt Mackall <mpm at selenic.com> wrote:
> 
> > On Sun, 2012-03-11 at 09:24 +0100, Na'Tosha Bard wrote:
> > > 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 have no idea how this code works or how to read its output (or even
> > how the patch code works any more!) but it took about 5 minutes to make
> > it work with both 1.8 and 1.9:
> >
> 
> I have started a fork on BitBucket with some changes to make the extension
> compatible with Mercurial 2.1.1:
> 
> https://bitbucket.org/natosha_bard/hg-mergediff
> 
> > 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.

> So, when I first read this, I immediately agreed that the output needed
> some work.  However, after sitting here and thinking about it, I actually
> think now we should leave it alone.
> 
> First of all, there's no way something like this is going to look that
> great in a terminal anyway.  Second of all, this extension does give output
> that looks like Git's combined diff format.  If we keep the same output,
> then GUI tools supporting both Git and Mercurial will only need one
> implementation for how to deal with this output.

Fair. But we will need to note that there are some semantic differences
here. We'll also need some tweaking still to match git's convention.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list