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

Re: [PATCH] Re: Patch ping, 5 years later: removing properties

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Thu, 17 Nov 2011 08:08:54 +0200

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.
Received on 2011-11-17 07:09:52 CET

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.