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

Re: missing svn diff -p, -c

From: Max Bowsher <maxb_at_ukf.net>
Date: 2005-04-04 23:38:37 CEST

Zack Weinberg wrote:
> 'svn diff' appears only to be capable of generating "unified diff"
> format, i.e. equivalent to diff -u. This is a good default, but I
> find myself missing two other modes of the standalone diff:
> 1) -c format, which prints each chunk as it was marked up with ! and
> - indicators, then as it is now marked up with ! and + indicators.
> For some changes this is substantially easier to read than -u format.
> 2) -p / --show-c-function: in conjunction with -c or -u, this tacks
> the name of the enclosing C function, if any, onto the end of each
> @@ -x,y +a,b @@ line. Extremely helpful when writing GNU-style
> changelogs (which require you to mention the name of each changed
> function).
> If I could have just one of these, I'd far rather have -p than -c; but
> both would be useful. (-p is crucial to my normal working habits, and
> I am resorting to "diff -up .svn/text-base/$file.text-base $file" in
> its absence.)
> In a related observation, I can't get svn diff -x to do anything
> useful. Whatever I put after the -x, I get a "not supported" message.

svn diff --diff-cmd diff -x "-u -p"


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 4 23:41:10 2005

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

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