Subversion and mdl files

10 Ansichten (letzte 30 Tage)
Carlo Marques
Carlo Marques am 1 Apr. 2011
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

Akzeptierte Antwort

Stuart Bowman
Stuart Bowman am 3 Nov. 2011
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 Kommentar
Carlo Marques
Carlo Marques am 3 Nov. 2011
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.

Melden Sie sich an, um zu kommentieren.

Weitere Antworten (4)

Jarrod Rivituso
Jarrod Rivituso am 1 Apr. 2011
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 Kommentar
Jarrod Rivituso
Jarrod Rivituso am 8 Apr. 2011
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

Melden Sie sich an, um zu kommentieren.


Carlo Marques
Carlo Marques am 1 Apr. 2011
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 am 4 Apr. 2011
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 Kommentare
Walter Roberson
Walter Roberson am 8 Apr. 2011
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 am 8 Apr. 2011
Walter, I really wish I could vote up a comment :)

Melden Sie sich an, um zu kommentieren.


Frederic Vartanian
Frederic Vartanian am 28 Mär. 2012
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/

Kategorien

Mehr zu Create Large-Scale Model Components finden Sie in Help Center und File Exchange

Produkte

Community Treasure Hunt

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

Start Hunting!

Translated by