[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: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 16 Jun 2011 02:14:28 +0300

Branko Čibej wrote on Wed, Jun 15, 2011 at 14:44:45 +0200:
> On 15.06.2011 14:11, Johan Corveleyn wrote:
> >> If you have a different definition of "mis-synchronizes", please explain.
> > No, I don't mean a broken diff. The diff should at all times be
> > *correct*. That was indeed never questioned.
> >
> > I mean something like the example Neels gave with his initial approach
> > for avoid the mis-matching empty line problem. With the naive
> > solution, he gave an example of where it's not nice:
> [...]
> But when would the current "minimal" diff be preferable to the nicest,
> albeit not minimal, diff we can produce? After all, the fix and/or
> patience diff result is not only nicer to look at, it also gives better
> results for blame, which is the other big diff consumer. Likewise, it'll

Why doesn't 'svn blame' take --diff-cmd then?

> give better locality for resolving merge conflicts. That's why I don't
> understand why Subversion, specifically, would need a --minimal option.
> GNU diff is a general-purpose diff tool. 'svn diff' is not.
> -- Brane
Received on 2011-06-16 01:15:10 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.