[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: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Tue, 19 Apr 2011 06:41:33 +0000

>>> 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?
...
> 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.

Good point. Hmm... What about making TMerge (optionally, controlled by a command line flag) immediately quit with a specific exit code when a binary file is encountered. (As opposed to showing the dialog that is the behavior today.) TortoiseProc could then notice this and start the script instead.

That way TMerge will have the first shot at diffing unknown files, and the script would be a fallback.

I guess this could even be extended to TortoiseIDiff, or any other script for that matter that is capable of detecting unexpected/undiffable files.

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2721275

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-19 08:52:22 CEST

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