[402371] CDOCompareUtil.compare fails with models that use Containment

Proxies 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=402371

1 files changed, 3 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java
index 104761f195..dcbc9be9a2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java
@@ -11,10 +11,12 @@
 package org.eclipse.emf.cdo.ui.internal.compare;
 
 import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.internal.ui.LegacyModeRegistry;
 import org.eclipse.emf.cdo.internal.ui.dialogs.SelectBranchPointDialog;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil;
+import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -91,6 +93,7 @@ public abstract class MergeAction implements IObjectActionDelegate
     CDOSession session = leftView.getSession();
     if (branchPoint.getTimeStamp() == CDOBranchPoint.UNSPECIFIED_DATE)
     {
+      CDOUtil.setLegacyModeDefault(LegacyModeRegistry.isLegacyEnabled(session));
       return session.openTransaction(branchPoint.getBranch());
     }