diff options
| author | Philip Langer | 2014-11-13 16:00:50 +0000 |
|---|---|---|
| committer | Axel RICHARD | 2014-12-07 15:17:23 +0000 |
| commit | 01ae0763a8e0156dabc6bcdd1bcef170f1782099 (patch) | |
| tree | 2f6a268534f4f781b88b300ba9d8d0035112b570 /plugins/org.eclipse.emf.compare.uml2.tests/.project | |
| parent | 4ae5ea7b3b5c828d6a88421fd396ad042a01967f (diff) | |
| download | org.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.tar.gz org.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.tar.xz org.eclipse.emf.compare-01ae0763a8e0156dabc6bcdd1bcef170f1782099.zip | |
[451365] Adds specific handling of opaque action, behavior & expression
Opaque actions, behaviors, and expressions all have a multi-valued
language and multi-valued body attribute. Their indices have to be kept
in sync, because the language value at the index n denotes the language
of the body value at the index n. Moreover, if concurrent changes to the
same body value are applied, they should be merged using a line-based
three-way merge algorithm. If they are not mergeable with such an
algorithm, a specific conflict should be raised.
This commit contributes support for the aforementioned requirements by
introducing a new UML-specific change type, specific conflict detection,
and a specific merger.
Bug: 451365
Change-Id: I6bf5c786e72a10c56eff7f0faaedd67b77528b4b
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/.project')
0 files changed, 0 insertions, 0 deletions