The introduction of the --git option to 'svn diff' opens the door for different "flavors" for 'svn diff' output. Would you be interested in a new 'svn diff --patch' flavor, which generates only diff output that's suitable for consumption with GNU patch? Implied by --patch would be no property diff output and the display of copied items as additions (like --show-copies-as-adds does).
Of course, --no-property-diff works for me, too. :-) On 11/03/2011 03:05 PM, Alexey Neyman wrote: > Hi all, > > Sorry for a long delay :) 5 years ago, I sent a patch to the mailing list > that > would allow to specify what to include/exclude from the diff output: > > > http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=742594 > > There were two problems this patch tried to address: > > 1. There was no way to exclude properties from the diff output. > > 2. There was no way to obtain a list of modified/added/deleted files and > whether the content and/or properties have been modified. > > I got a response from Ben Collins-Sussman that the patch I sent is superseded > by --summarize option which was implemented in the trunk (which would > eventually become 1.4): > > http://svn.haxx.se/dev/archive-2006-06/0202.shtml > > Actually, --summarize only addresses the issue #2, but not the issue #1. As > to > issue #1, ability to disable property diffs is still missing from Subversion. > Common wisdom suggests running the diff through 'filterdiff --clean': > > http://stackoverflow.com/questions/2755848/how-do-you-get-subversion-diff- > summary-to-ignore-mergeinfo-properties > http://stackoverflow.com/questions/402522/is-there-a-metadata-exclusion- > filter-for-the-svn-diff-command > > But this is still unreliable: if property text includes a diff-like chunk, it > will go through. > > What is the sentiment about implementing --no-property-diff option to 'svn > diff'? I can implement it if there's agreement such option is needed. > > Regards, > Alexey. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Distributed Development On Demand
signature.asc
Description: OpenPGP digital signature
