Merging .mlapp files via SVN

Is it possible to merge .mlapp files with svn? I'm using Tortoise SVN and already set the MatLab comparison tool as an external diff using the instrucions specified here. But when I try to update/commit them and there's a new version by another user in the target folder I get an error message by Toroise SVN saying there is a conflict between the two revisions. Resolving the conflict leads me to the MatLab comparison tool in which the merge button is missing. So effectively I am unable to merge the two revisions. Am I doing something wrong?

[Jim Cornacchio]

Benno, I'm having the same issue, but using Git. I don't believe that we can currently merge .mlapp files, only compare. I read through the documentation carefully after running to the issue and the subtitles are:

Compare and Merge Text

Compare and Merge Live Code

Compare and Merge MAT-Files

Compare Binary Files

I think that the last subtitle is purposefully missing the word "Merge." This is a problem that needs to be fixed....

Answer 1

[Mark Eigenraam]

Yes, we are finding this to be an issue as well. We cannot doa DIFF in Tortoise and the mlapp files are binary? This is a real issue of concern!

[Jim Cornacchio]

Hi Mark,

You can diff and merge MLAPP files starting in MATLAB 2020b, at least from within MATLAB:

https://www.mathworks.com/help/matlab/matlab_env/compare-and-merge-apps.html

Good luck!

-Jim

[Mark Eigenraam]

Hi Jim,

thanks for the help. From within Matlab I am trying to do a diff on a file but get the following error message. It is very difficult to change the SVN URL!

[Walter Roberson]

It is not happy with the ^

Is that indicating a control-E?

You should percent-encode the same way that you have %20 to encode the space.

[Mark Eigenraam]

thanks Walter, the SVN source control dir in Tortoise is: https://subversion.assembla.com/svn/ideea%5EEnSym

and this is it in Assembla

https://subversion.assembla.com/svn/ideea^EnSym/

it seems Matlab does seem to be dealing with it?