On Wed, Aug 29, 2012 at 02:08:31PM -0400, Q. Chap wrote:
> Interesting. Thank you.
> 
> Couple of questions:
> 
> 1. "--summarize" complains that it can only work on URL-URL diffs.  Is there 
> a work around?
No.

Well, maybe you could do something like
  svn diff | grep ^Index
to obtain a list of filenames from the full diff output?


> 2. Running without "--summarize" works, but I see a ton of "mergeinfo" 
> entries like:
> 
>     Property changes on: Somefile
>     ___________________________________________________________________
>     Modified: svn:mergeinfo
>        Merged /branches/path/Somefile:r19415-19622
> 
> This is accurate I suppose (what's it indicate?), but gets in the way of 
> seeing the list of patched files. i.e. "Somefile" is unrelated to any of my 
> changes.  Can this be suppresed?

Not in Subversion 1.7, unfortunately.

You will be able to suppress this in Subversion 1.8, which will ship
with new --ignore-properties and --properties-only options to make
everyone happy.

For the time being, there is another third-party utility called filterdiff
which might be able to get rid of the property diffs. It is part of the
patchutils package, see http://cyberelk.net/tim/software/patchutils/

You could also write your own post-processing filter.

> 3. Running the above diff also outputs lines related to some files that I 
> know I never modifed, but did recive updates via the merge. Oddly, these are 
> all binary files.
> 
>     Index: Path/to/bin.dat
>     ===================================================================
>     Cannot display: file marked as a binary type.
>     svn:mime-type = application/octet-stream
> 
> What does this indicate?

Not sure. Did these files also receive mergeinfo changes perhaps?

Reply via email to