Alexey Neyman wrote on Wed, Nov 16, 2011 at 16:09:51 -0800:
> On Sunday, November 06, 2011 10:27:01 am Daniel Shahaf wrote:
> > Perhaps the solution is to make 'svn diff' use --diff-cmd for propdiffs
> > too?  It seems that currently --diff-cmd is only used for file content
> > diffs.
> 
> I guess this is sort of a feature. As Julian pointed out, the property diffs 
> are output using a different hunk format that starts with ## instead of @@. 
> Thus invoking an external diff utility (which does not know whether it is 
> diffing, content or property) would actually make the problem worse.

As we say here: the answer's in the formulation of the question.  You
could tell the external diff what it's diffing -- or, perhaps easier,
configure a separate [helpers]diff-cmd and [helpers]propdiff-cmd .

> FWIW, I implemented the --patch option for 'svn diff' as suggested - implying 
> no property diffs and copies-as-additions. Patch against trunk, r1202879; 
> survives 'make check'.

I haven't looked at those yet.

Reply via email to