[504014] Make merge information available in CDOCommitInfo

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

2 files changed, 15 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
index 6eb82f3240..293fe26901 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.compare;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.100.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.ui.internal.compare.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -20,6 +20,6 @@ Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
  com.google.common.collect;version="[11.0.0,16.0.0)",
  com.google.common.cache;version="[11.0.0,16.0.0)",
  com.google.common.util.concurrent;version="[11.0.0,16.0.0)"
-Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.4.0",
- org.eclipse.emf.cdo.ui.internal.compare;version="4.4.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.4.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.4.100",
+ org.eclipse.emf.cdo.ui.internal.compare;version="4.4.100";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.ui.internal.compare.bundle;version="4.4.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
index 4496509176..68251cf735 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
@@ -583,7 +583,7 @@ public class CDOCompareEditorUtil
     configuration.setRightLabel(rightLabel);
     configuration.setRightEditable(rightEditable);
 
-    Input input = new Input(rightView, configuration, comparison, editingDomain, adapterFactory);
+    Input input = new Input(leftView, rightView, configuration, comparison, editingDomain, adapterFactory);
     input.setTitle(title);
 
     workaroundEMFCompareBug(leftView, leftLabel);
@@ -752,6 +752,8 @@ public class CDOCompareEditorUtil
   {
     private static final Image COMPARE_IMAGE = OM.getImage("icons/compare.gif");
 
+    private final CDOView sourceView;
+
     private final CDOView targetView;
 
     private final Comparison comparison;
@@ -762,11 +764,12 @@ public class CDOCompareEditorUtil
 
     private boolean suppressCommit;
 
-    private Input(CDOView targetView, CompareConfiguration configuration, Comparison comparison,
+    private Input(CDOView sourceView, CDOView targetView, CompareConfiguration configuration, Comparison comparison,
         ICompareEditingDomain editingDomain, AdapterFactory adapterFactory)
     {
       super(new org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration(configuration),
           comparison, editingDomain, adapterFactory);
+      this.sourceView = sourceView;
       this.targetView = targetView;
       this.comparison = comparison;
 
@@ -806,9 +809,9 @@ public class CDOCompareEditorUtil
     @Override
     public void saveChanges(IProgressMonitor monitor) throws CoreException
     {
-      if (targetView instanceof CDOTransaction)
+      if (targetView instanceof InternalCDOTransaction)
       {
-        CDOTransaction transaction = (CDOTransaction)targetView;
+        InternalCDOTransaction transaction = (InternalCDOTransaction)targetView;
         if (transaction.isDirty())
         {
           Collection<CDOObject> values = transaction.getNewObjects().values();
@@ -860,6 +863,10 @@ public class CDOCompareEditorUtil
         {
           if (!suppressCommit)
           {
+            CDOBranchPoint mergeSource = sourceView.isHistorical() ? CDOBranchUtil.copyBranchPoint(sourceView)
+                : sourceView.getBranch().getPoint(sourceView.getLastUpdateTime());
+
+            transaction.setCommitMergeSource(mergeSource);
             transaction.commit(monitor);
             setDirty(false);
           }