Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2015-01-07 10:19:04 -0500
committerAxel RICHARD2015-01-21 06:49:11 -0500
commitb845f84cbf9c4259c822435c2f7b240174e625d9 (patch)
tree7e8c192de2213d41bed448bfa1fe788e5eba7fa8 /plugins/org.eclipse.emf.compare.uml2.tests
parent4914dc7994243cf26780180e9ecba9c83570ea76 (diff)
downloadorg.eclipse.emf.compare-b845f84cbf9c4259c822435c2f7b240174e625d9.tar.gz
org.eclipse.emf.compare-b845f84cbf9c4259c822435c2f7b240174e625d9.tar.xz
org.eclipse.emf.compare-b845f84cbf9c4259c822435c2f7b240174e625d9.zip
[456860] Improve handling of equivalent three-way text changes
Three-way diffing and patching is not supported by google diff match patch (dmp) and simply applying the patch computed by dmp to the opposite side, as we did before, would cause the equivalent changes to be applied twice. Therefore, we had to re-implement the detection and merging ourselves to support the handling of equivalent changes. We also adapted the test cases and the implementation of the three-way diff and merge to correspond to the behavior of the org.eclipse.compare line differencing and introduced a determination of the currently used line separator in the text, which is now also used when building the merged version. Bug: 456860 Change-Id: I12be9c68eda663e0206c9f230a9faf9631be3275 Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml
index f6a67250b..44e91e2dd 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml
@@ -15,7 +15,7 @@ of them.</body>
<body>This is an OCL&#xD;
test with multi-line&#xD;
String attribute&#xD;
-and concurrent changes (changed)&#xD;
+(changed) and concurrent changes&#xD;
of them.</body>
</node>
</packagedElement>

Back to the top