| commit | 99bed8d465f6e4a66fbd1fe11330618bb4953e98 | [log] [tgz] |
|---|---|---|
| author | Glenn Plouhinec <glenn.plouhinec@obeo.fr> | Thu Apr 09 16:46:31 2020 +0200 |
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | Tue Apr 21 05:39:29 2020 -0400 |
| tree | f4a1db6f2aa9dfb3789833feb8474b33e1f48cef | |
| parent | ae3c3115d685981f6cc4710b3f24ee8293d5af33 [diff] |
[561825] Merge a Sirius Node doesn't merge "actualMapping" difference. The implies/impliedBy relations of Sirius Nodes should not be automatically merged and just noted as "MERGED". These differences should be merged just like the others. - Add a new Merger, SiriusReferenceChangeMerger, to manage these "implies/impliedBy" relations. - Add unit tests. Bug: 561825 Change-Id: If191702dc31ec00cce0410ecc39a0ee3e5dac0dd Signed-off-by: Glenn Plouhinec <glenn.plouhinec@obeo.fr>