This thread looks to be a little on the old side and therefore may no longer be relevant. Please see if there is a newer thread on the subject and ensure you're using the most recent build of any software if your question regards a particular product.
This thread has been locked and is no longer accepting new posts, if you have a question regarding this topic please email us at support@mindscape.co.nz
|
Can you advise me on the best approach to merge .Ismodel.diagram changes from different source control branches ?
I'm seeing alot of <..AssociationConnector> changes, whats the best approach when these conflict ?
Any help will be much appreciated, thx.
Simon ;o) |
|
|
|
|
There's no good way to merge .diagram files. Probably the best thing to do is just pick one version or the other. You may need to re-place some entities (specifically if you have newly added ones) or re-route some connections but mostly you should be okay as long as there haven't been too many changes in the model (or you haven't got too enthusiastic about hand-routing connections!). |
|
|
|
|
Ok maybe too hopeful. Can you give me anymore pointers regarding tags or attributes to watch out for ? and those where changes can be ignored ?
Btw. My ideal answer would have been 'yeah just right click the model and you have an option to rebuild the diagram from the .ismodel file' ;o) |
|
|
|
|
Tags and attributes: * Watch out for Id attributes. Visual Studio likes to sneakily change entity shape GUIDs, but these GUIDs are used to indicate which shapes a connector connects. So if you take an entity shape from v1 with GUID G1, and a connector from v2 with entityShapeMoniker G2, then much confusion will result. You need to make sure your merged file uses a consistent set of GUIDs. * xxxMoniker tags are how shapes are mapped to entities. For example, if an entity has changed name across the two versions of the model, you must use the entityShape with the right entityMoniker. There's a similar situation with association connectors and their xxxAssociationMoniker tags, except they use (hurrah) GUIDs so it's much harder to spot differences. * Most changes to elementListCompartments can be ignored. * Most changes to association connector edgePoints can be ignored. You may lose some hand-routing of connectors, but it's probably easier just to recreate this in the GUI. * Try to preserve entityShape absoluteBounds attributes as these are what determine where an entity is placed in the GUI. [quote user="simbu"]My ideal answer would have been 'yeah just right click the model and you have an option to rebuild the diagram from the .ismodel file'[/quote] That would be the right-click > Arrange command. Though this has a 60% chance of making things worse rather than better *grin*. |
|
|
|
