diff options
| author | Philip Langer | 2015-01-07 15:19:04 +0000 |
|---|---|---|
| committer | Axel RICHARD | 2015-01-21 11:49:11 +0000 |
| commit | b845f84cbf9c4259c822435c2f7b240174e625d9 (patch) | |
| tree | 7e8c192de2213d41bed448bfa1fe788e5eba7fa8 /plugins/org.eclipse.emf.compare.uml2.tests/src/org | |
| parent | 4914dc7994243cf26780180e9ecba9c83570ea76 (diff) | |
| download | org.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/src/org')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/data/a3/right.uml | 2 |
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
 test with multi-line
 String attribute
 -and concurrent changes (changed)
 +(changed) and concurrent changes
 of them.</body> </node> </packagedElement> |