[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: diff wish

From: Peter Samuelson <peter_at_p12n.org>
Date: Thu, 16 Jun 2011 12:23:32 -0500

> > While we're on the subject of 'diff wish', my wish is that diff3 could
> > remove lines from the top and bottom of a conflict region that are the
> > same on both "sides".  Whether this happens as a natural part of the
> > implementation, or in a post-processing step, I don't care so much.
> > But at present, Subversion frequently gives me a conflict region that
> > includes a lot of identical text above and below the actual conflict.

[Johan Corveleyn]
> Ah, but if I'm not mistaken that's just the kind of improvement that
> was suggested by Morten in the recent thread "Improvements to diff3
> (merge) performance" [1].

His situation is similar, but he went further. He's talking about
cases where the conflict can be eliminated entirely. Of course that is
risky - it can be hard to know programmatically when something truly
should not be flagged as a conflict.

What I want is much simpler. Given a conflict region, make it smaller
by removing lines from the top and bottom that do not actually differ.
Don't eliminate the conflict entirely. My "proposal" does not lose any
information; by reducing the size of the conflict region, it makes it
easier to see what the actual difference is. And as I said, even if
what I want does not happen naturally in a diff3 algorithm, it can be
done as a post-processing step.

Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
Received on 2011-06-16 19:24:11 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.