[504014] Make merge information available in CDOCommitInfo

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

3 files changed, 15 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
index facc99bf1f..a5890bb186 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
@@ -128,6 +128,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
     long lastUpdateTime = in.readLong();
     int commitNumber = in.readInt();
     String commitComment = in.readString();
+    CDOBranchPoint commitMergeSource = in.readBoolean() ? in.readCDOBranchPoint() : null;
 
     CDOLockState[] locksOnNewObjects = new CDOLockState[in.readInt()];
     CDOID[] idsToUnlock = new CDOID[in.readInt()];
@@ -298,6 +299,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
       commitContext.setDetachedObjectTypes(detachedObjectTypes);
       commitContext.setDetachedObjectVersions(detachedObjectVersions);
       commitContext.setCommitComment(commitComment);
+      commitContext.setCommitMergeSource(commitMergeSource);
       commitContext.setLobs(getIndicationStream());
       commitContext.setLocksOnNewObjects(locksOnNewObjects);
       commitContext.setIDsToUnlock(idsToUnlock);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
index 5b5d4fe474..cc3cca4bcd 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.server.internal.net4j.protocol;
 
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
 import org.eclipse.emf.cdo.common.protocol.CDODataInput;
@@ -68,6 +69,17 @@ public class LoadCommitInfosIndication extends CDOServerReadIndication
             out.writeLong(commitInfo.getTimeStamp());
             out.writeString(commitInfo.getUserID());
             out.writeString(commitInfo.getComment());
+
+            CDOBranchPoint mergeSource = commitInfo.getMergeSource();
+            if (mergeSource != null)
+            {
+              out.writeBoolean(true);
+              out.writeCDOBranchPoint(mergeSource);
+            }
+            else
+            {
+              out.writeBoolean(false);
+            }
           }
           catch (IOException ex)
           {
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
index 2c20997c8f..6d55797ef2 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
@@ -208,6 +208,7 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
       out.writeBoolean(repository.isSerializingCommits());
       out.writeBoolean(repository.isEnsuringReferentialIntegrity());
       out.writeEnum(repository.getIDGenerationLocation());
+      out.writeEnum(repository.getCommitInfoStorage());
 
       CDOPackageUnit[] packageUnits = repository.getPackageRegistry(false).getPackageUnits();
       out.writeCDOPackageUnits(packageUnits);