Subversion and mdl files

4 次查看（过去 30 天）
Carlo Marques
Carlo Marques 2011-4-1
Hello
Does anybody know how to have real "merge" action between two .mdl files? Specifically if you are using subversion version control how can we handle a .mdl file share between two users? Thanks

请先登录，再回答此问题。

采纳的回答

Stuart Bowman
Stuart Bowman 2011-11-3
There is a third-party application known as SimMerge (<http://www.ensoftcorp.com/SimMerge/Overview.gen.html>) that is quite helpful for this. (I'm a user, not affiliated with the company.) It's a bit expensive, but well worth the cost if working on a team. It supports two- and three-way diff and merging as you would expect with any other source code management tool.
  1 个评论
Carlo Marques
Carlo Marques 2011-11-3
Thanks Stuart. I did look into the SimMerge tool and it should od the trick. Probaly will only be able to implement it next year as the cost, as you said, is high.

请先登录，再进行评论。

更多回答（4 个）

Jarrod Rivituso
Jarrod Rivituso 2011-4-1
Hi Carlo,
I'm not aware of a way to do this. However, an alternative would be to break apart your model into multiple .mdl files and use model reference to combine them. This would allow different users to work on their own separate pieces of the model, and not have to worry about merging later.
This approach is also useful in that it allows you to test smaller components of your model individually.
Hope this helps! -Jarrod
  1 个评论
Jarrod Rivituso
Jarrod Rivituso 2011-4-8
Hi Carlo,
Check out the release notes for the latest version of Simulink (look under "Model Management"):
http://www.mathworks.com/products/simulink/whatsnew.html

请先登录，再进行评论。

Carlo Marques
Carlo Marques 2011-4-1
Hello Jarrod,
Thanks for the hint. It's not what I am looking for, even though it would limit the impact.
Best Regards Carlo marques
MarkB
MarkB 2011-4-4
In general, doing text merges on ".mdl" files doesn't go well, so I would strongly advise against this. The primary issue is that text in ".mdl" files isn't as "local" as text in a regular source code file would be. As a result, text in one part of a model file may also influence the meaning of text elsewhere in the model. It isn't as convenient, to be sure, but it is probably best to configure your version-control system to treat ".mdl" files as binary even though they are text-based.
  4 个评论
显示 2更早的评论
Walter Roberson
Walter Roberson 2011-4-8
I see that the new 2011a highlights include,
Merge capability for Simulink models from the XML text comparison in Simulink Report Generator™
That _sounds_ to provide the missing mechanism.
Jarrod Rivituso
Jarrod Rivituso 2011-4-8
Walter, I really wish I could vote up a comment :)

请先登录，再进行评论。

Frederic Vartanian
Frederic Vartanian 2012-3-28
medini unite also provides SIMULINK model merge capabilities. It can be integrated in a number of SCM tools, such as CVS, SVN, ClearCase, Visual Source Safe and more. You can request a trial here http://www.ikv.de/mediniunite/

类别

在 Help Center 和 File Exchange 中查找有关 Naming Conventions 的更多信息

标签

产品

Community Treasure Hunt

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

Start Hunting!

Translated by