diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES index 668142a53..971aabe93 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/CHANGES @@ -104,7 +104,9 @@ Expected Differences Conflicts on :
1 and 15 : Not a generic conflict, relies on ecore-specific business rules : enum literals of the same enum with the same 'value'.
8, 19 and 23 : REAL : locally deleted Periodical. However, we've remotely set "Periodical" as the super-type of Magazine.
- 31, 45, 32 and 46 : PSEUDO : We've removed title both locally and remotely, which is a PSEUDO conflict.
+ 31 and 32 : PSEUDO : We've removed title both locally and remotely, which is a PSEUDO conflict.
+ 45 and 46 : PSEUDO : inferred from the deletion of title from both sides, we've unset the eType of title on both sides. PSEUDO conflict.
12 and 27 : REAL : remote renaming of a locally deleted attribute
14 and 28 : REAL : renaming to different values
- 29, 30, 33 and 34 : PSEUDO : BookOnTape.reader removed from both sides, and thus its type unset on both sides.
\ No newline at end of file + 29 and 30 : PSEUDO : BookOnTape.reader removed from both sides, and thus its type unset on both sides.
+ 33 and 34 : PSEUDO : inferred from the deletion of reader on both sides, we've unset the eType of reader on both sides.
\ No newline at end of file |