フィルターのクリア

Merging .mlapp files via SVN

4 ビュー (過去 30 日間)
Benno Schumacher
Benno Schumacher 2018 年 9 月 6 日
コメント済み: Mark Eigenraam 2022 年 3 月 2 日
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?
  1 件のコメント
Jim Cornacchio
Jim Cornacchio 2018 年 11 月 19 日
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....

サインインしてコメントする。

回答 (1 件)

Mark Eigenraam
Mark Eigenraam 2022 年 3 月 1 日
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!
  4 件のコメント
Walter Roberson
Walter Roberson 2022 年 3 月 2 日
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
Mark Eigenraam 2022 年 3 月 2 日
thanks Walter, the SVN source control dir in Tortoise is: https://subversion.assembla.com/svn/ideea%5EEnSym
and this is it in Assembla
it seems Matlab does seem to be dealing with it?

サインインしてコメントする。

カテゴリ

Help Center および File ExchangeSource Control についてさらに検索

製品


リリース

R2018a

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by