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

Re: diffing binary files/ custom diff filter tool

From: Branko Čibej <brane_at_xbc.nu>
Date: 2004-07-31 13:30:05 CEST

Ulrich Eckhardt wrote:

>Branko Čibej wrote:
>
>
>>Ulrich Eckhardt wrote:
>>
>>
>>>In simple words: is there a way to plug in a diff-tool that first looks at
>>>'svn:mime-type' and then conditionally calls the Right Tool(tm) for the
>>>given type?
>>>
>>>
>>Yes, of course. The "diff tool" could be a script that looks at the SVN
>>file properties in the working copy (via "svn propget svn:mime-type,"
>>for example). However, note that this would work when explicitly calling
>>invoking "svn diff".
>>
>>
>
>Hmmm, I tried using the --diff-cmd switch on the commandline, but it shews me
>that I only get two files on the commandline, neither of which is in the
>public part of the workingcopy but in some .svn subdir.
>
>
Oh duh, that's right, you can't (always) trivially convert the diff
parameters to a WC path. That is indeed a problem, and I can't think of
a general solution without changes in the --diff-cmd semantics.

>>It would _not_ magically make Subversion merge
>>differences in binary files using your tool during "svn update", because
>>Subversion's notion of when a file is binary is hard-coded, and if it
>>thinks a file is binary, it won't invoke diff3 to do the merge.
>>
>>
>
>Doesn't SVN just look at the mime-type, too? I'd take a look at it, but the
>weather is just too good for hacking ...
>
>
Yes, it looks at the mime type, but the set of "text" mime-types is
hard-coded; you can't modify it.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 31 13:30:29 2004

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