top button
Flag Notify
    Connect to us
      Facebook Login
      Site Registration Why to Join

Facebook Login
Site Registration

SVN: How to use external diff3 for binary files?

+1 vote
36 views

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 command line menu.

HOW TO TELL TO SVN TO ACCEPT --DIFF3-CMD MYDIFF3.EXE FOR BINARY FILES?

RTFM (diff3-cmd and External Tools from svn red-book) doesnt help.

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

posted Aug 4, 2015 by anonymous

Looking for an answer?  Promote on:
Facebook Share Button Twitter Share Button Google+ Share Button LinkedIn Share Button Multiple Social Share Button

Similar Questions
+1 vote

I have 30 files that I want to merge, but I do not know which would be the easiest and much efficient and save way to do so.
I have the main production line Z and two other branches X and Y. All of the branches are still in production since X and Y are minor releases. Therefor on a time frame they are look this:
Z - trunk, next major releaseY - next minor release (Z - Y = small changes)X - used to make patches for an old release
The idea is that between Z and Y arent so many differences, but between X and Y(or Z) are plenty. There was a fix in the X branch that needs to be back ported into Z and Y. I am using svn merge to merge changes from X to Y, but because of the big differences I think it adds even code that could not be useful in Y, showing as conflicts just a few code blocks/file. which would be the best approach for such a merge?

0 votes

Is there a way to detect that current directory is the root of SVN repository by reading files into .svn directory ? I think "svn info" could be used for that. Problem is that some machines may not have access to "svn" command line (if using tortoise and svn is not in command PATH for example).

In case "svn info" (or any other command line) is the only way, what would be the proper way to do it ?

0 votes

I created a repo using svnadmin create in a dir called trunk (that's what your supposed to do, right?) The operation succeeded but the files that I want to version (c source which I should have versioned long ago.)

I can't seem to add to the repo. When the code is ready for alpha release I plan to host it on source forge but until then It's just me working on the code and my online connection is intermittent so I decided to create my repo locally.

+2 votes

While merging branch back to trunk I constantly get the error in the subject. Note that x/y/z has svn:mergeinfo property. The property was not added on the branch, but it was already there when the branch was created. Subsequently x/y/z is deleted on branch.

The error is generated when running: "svn merge ^/branches/mybranch" on a trunk working copy.

Sounds to me like a bug, svn tries to update the mergeinfo on the deleted path. Is that so ?

+2 votes

We are using svn 1.6 - we tried merging from Trunk to a feature branch using svn merge (automatically). We just found out that some files are not updated with the merges but mergeinfo has already indicated and ci with the messages that those files are merged. We like to perform svn merge again using the same revision number from the trunk to the feature branch would svn refuse simply because it was merged "successfully" before ?

Are there side effects in applying svn merge again on the same revision numbers from the mergeinfo property ?

Contact Us
+91 9880187415
sales@queryhome.net
support@queryhome.net
#280, 3rd floor, 5th Main
6th Sector, HSR Layout
Bangalore-560102
Karnataka INDIA.
QUERY HOME
...