[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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 1 Apr 2011 20:36:20 +0200

On Thu, Mar 31, 2011 at 21:18, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 31.03.2011 10:00, Hans-Emil Skogh wrote:
>> Hi all!
>> Some time ago I tried to diff two exe-files using TortoiseSVN. I was
>> positively surprised to find that we indeed have a diff script for
>> that!
>> Unfortunately the result was not really what I expected. Neither
>> exe-file provided any version information, and this triggered the
>> script to say that files are identical, even though they differed in
>> both size and content.
>> I did some modifications to the script and the result is attached.
>> This new version can be used as a drop in replacement for
>> diff-dll.vbs, but it is really intended to be able to diff all binary
>> (svn:mime-type = application/octet-stream) files.
>> Would it be possible to call this script diff-binary.vbs, and use it
>> as the default diff script if no other diff script matches and at
>> least one of the files to be diffed has the binary mime type?
> Thanks a lot.
> Committed in r21089.
> I'll extend the registering function to also use mime-types.

On second thought: registering this for all application/octed-stream
mime-types is a bad idea: SVN also marks files in utf16 as such, but
TMerge is perfectly fine showing the diffs for those.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-01 20:36:44 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.