| Papyrus model comparison results in a lot of non-existing differences [message #1749442] |
Tue, 06 December 2016 18:50  |
|
When I try to compare a workspace version of a simple Papyrus model with an earlier version stored in a local git-repo using "Compare With->Commit..." from the context menu the resulting differences in the comparison editor indicates a lot of differences even if there are only one element that have been moved slightly in a diagram.
The right side of the comparison editor indicates that something have not been resolved correctly as elements are presented staring with "Proxy:Platform resource..." instead of the actual name of the element. See attached screenshot
I can also mention that comparison of two versions of the same model in the workspace works as expected. The problem only occur when comparing a model in the workspace with a commited model in Git.
I am running Papyrus 2.0.1 on Neon.1 on Windows 64 and have installed EMF Compare 3.3 with support for UML2, GMF and Papyrus, see attached screenshot.
I have selected the "Recursive Model Merge Strategy" and also "Pre-merge models when a real conflict is detected" in the preferences.
Have I missed something in the installation around EMF Compare/Git support or are there any more preference settings to tune?
Thomas Wiman
MetaModelAgent Product Manager
|
|
|
|
|
| Re: Papyrus model comparison results in a lot of non-existing differences [message #1749492 is a reply to message #1749484] |
Wed, 07 December 2016 10:51  |
|
I finally successed in getting the comparison to work correctly
I totally reinstalled Papyrus 2.0.1 RCP and on top of that the components from the two repositories belonging to the integration build at collaborative-modeling.org.
I also had to switch to a brand new workspace and reconfiguring the recommend preference settings.
I must say that it is a bit confusing that the official 3.3 build (which is newer than the integration build) does not work, but that the "older" does. Trying to "upgrade" from the official 3.3 build to the integration build will therefor fail.
Thanks for the support on this issue Philip
Thomas Wiman
MetaModelAgent Product Manager
|
|
|
|
| Re: Papyrus model comparison results in a lot of non-existing differences [message #1749530 is a reply to message #1749504] |
Wed, 07 December 2016 18:50 |
|
Hi Thomas,
hi Peter,
you are indeed right, it is confusing with the custom builds. We try to communicate that as clearly as possible and work on resolving this asap. In fact, Laurent D. (Obeo) has succeeded in getting the last most crucial commit merged in EGit today. So things are looking good for the next release, but we'll have to see and continue testing, if now everything crucial is included in EGit.
As it turns out, the issue you are having in your comparison (as shown in your screenshot), is because the comparison has been started from the project and not from the model file. If the comparison is started from the model, the comparison works well. I could reproduce this issue and took the liberty to create a bug report (bug 508855). After looking into this bug, I found the reason for it and sketched a solution, which I'll push for review and testing soon. I'll have to check if my solution has any side-effects first. Feel free to cc yourself in bug 508855, if you want to be notified on the progress.
Thanks for reporting this issue!
Best wishes,
Philip
--
Philip Langer
Get professional Eclipse developer support:
http://eclipsesource.com/en/services/developer-support/
--
Philip Langer
Get professional Eclipse developer support:
http://eclipsesource.com/en/services/developer-support/
[Updated on: Wed, 07 December 2016 19:21] Report message to a moderator |
|
|
Powered by
FUDForum. Page generated in 0.02592 seconds
Search
Help
Register
Login
Home
