[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-29 15:10:31 CEST

Ulrich Eckhardt wrote:

>Ulrich Eckhardt wrote:
>[...]
>Rereading that, I find it pretty hard to understand, which might be why nobody
>answered.
>
>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". 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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 29 15:10:58 2004

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