On Wed, Aug 29, 2012 at 05:47:21PM -0400, Q. Chap wrote:
> > >
> > > 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?
> >
>
> Interesting idea. Out curiosity, what is the cause for the limitation?
It hasn't been implemented.
> > 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.
> >
>
> The "--ignore-properties" option seems like a big hammer for this use case.
>
> I guess that I'm thinking "svn:mergeinfo" is more of an automatically maintained internal detail to aid in merge tracking. Seems a bit different than other properties like ignore or externals that are more closely related to the actual content of my code-base. Wrong?
>
> Too late to request an "--ignore-housekeeping" option to svn diff for 1.8? :-)
Of course, we could add --ignore-mergeinfo, too. It's just a matter of
someone finding the time and energy to do it.
> > > 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?
>
>
> No, those files do not have any mergeinfo at all. At least for the couple I checked. They do have changes brought in by the merge, though.
>
> Does this make any sense?
Ah, in that case the files are modified so they show up in diff output.
Are you confused by the fact that Subversion cannot display diffs
for arbitrary binary files? It only supports diffing text files.
Received on 2012-08-30 13:10:27 CEST