Hi!
If you are using EA with SVN you can merge changes made to different branches of your model.
Please note that the process described below makes use of a EA bug (of feature if you prefer) and might not work for future releases of EA.
Until then the process works for build 833.
In order to do this follow those steps:
1. Open an EA project with your "branch" model.
2. Export the Model (root) to XMI file.
3. Open an EA project with "trunk" model.
4. Disconnect package Model (root) from VC.
5. Execute compare Compare with XMI File command on the root pointing to the XML file exported in step 2 (from the branch).
6. Using EA compare utility merge the changes back to trunk. (Yes! This works even when you don't checkout any packages!)
7. For each and every modified package perform dummy CheckIn (CheckOut followed by CheckIn) to save merged changes.
8. You are done! :-)
As you see its quite tricky and if you have many changes its very time consuming. You have to remember what packages have been changed by merge operations and you need to check out + check in every single package affected by merge operations.
Good luck!
Jakub
Jakub Mendys Consulting
www.jmendys.com
