| commit | 22c21612be43f38771b64e81a328ec215d470864 | |
| author | Christian W. Damus <give.a.damus@gmail.com> | |
| Mon, 11 Sep 2017 11:43:59 +0000 (11 07:43 -0400) | ||
| committer | lgoubet <laurent.goubet@obeo.fr> | |
| Wed, 17 Jul 2019 15:03:15 +0000 (17 17:03 +0200) | ||
| tree | a3dbbc478b4252c99af017535a17bedd5617d061 | treesnapshot (tar.gz zip) |
| parent | 1998e64ba331e977271a01a57e1e12dbb5a99148 | commitdiff |
[522080] [UML] Add-add conflicts in stereotype application not detected
Two changes in the UML post-processor to handle apply-apply and
unapply-unapply conflicts for stereotype applications on the same
element
in both sides of the comparison:
* re-match left- and right-side additions/removals of stereotype
applications
to match the same stereotype applied to the same element even though
the XMI IDs are different
* generate the attribute diffs in added stereotype applications that the
default diff engine refuses to do, so that we may find conflicts in
differing
attribute values in the conflict phase (references are handled by the
core)
Bug: 522080
Change-Id: I4daac02414abc3f275ac9ff19d6a460b43a0fe84
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Two changes in the UML post-processor to handle apply-apply and
unapply-unapply conflicts for stereotype applications on the same
element
in both sides of the comparison:
* re-match left- and right-side additions/removals of stereotype
applications
to match the same stereotype applied to the same element even though
the XMI IDs are different
* generate the attribute diffs in added stereotype applications that the
default diff engine refuses to do, so that we may find conflicts in
differing
attribute values in the conflict phase (references are handled by the
core)
Bug: 522080
Change-Id: I4daac02414abc3f275ac9ff19d6a460b43a0fe84
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
23 files changed: