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

How to use external diff3 for binary files?

From: Y Coder <yn.coder_at_gmail.com>
Date: Tue, 4 Aug 2015 11:01:25 +0300

Hi!

I have some external mydiff3.exe, working with text and binary files
(simple gui for Use_their-Use_mine).

My svn command line is

svn.exe update my_work_copy_path --diff3-cmd mydiff3.exe

This work well for text files (svn call mydiff3.exe for each conflicted
files through update process), but for binary files svn skip the
mydiff3.exe and show the internal commandline menu.

*How to tell to svn to accept --diff3-cmd mydiff3.exe for binary files?*

RTFM (diff3-cmd
<http://svnbook.red-bean.com/en/1.8/svn.ref.svn.html#svn.ref.svn.sw.diff3_cmd>
and External Tools
<http://svnbook.red-bean.com/en/1.8/svn.advanced.externaldifftools.html>
from svn red-book) doesn't help.

*PS *There is a mention that the behavior depends on mime-type - but it is
not clear where to configure it.

Thank you!
Received on 2015-08-04 10:01:39 CEST

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

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