diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java index 8e4ad0801..0d890fe6e 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java @@ -26,7 +26,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.DifferenceSource; -import org.eclipse.emf.compare.DifferenceState; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.internal.utils.DiffUtil; @@ -616,7 +615,7 @@ public class ReferenceChangeMerger extends AbstractMerger { while (impliedReferenceChanges.hasNext()) { final ReferenceChange implied = impliedReferenceChanges.next(); - if (implied != diff && implied.getState() == DifferenceState.MERGED) { + if (implied != diff && isInTerminalState(implied)) { if (implied.getReference().isMany() && isAdd(implied, rightToLeft)) { internalCheckOrdering(implied, rightToLeft); checkImpliedDiffsOrdering(implied, rightToLeft); |