1 files changed, 20 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
index eccf56cadf..7ad2dd1998 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl;
 import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl.MoveableList;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.model.CDOFeature;
+import org.eclipse.emf.cdo.protocol.revision.CDODuplicateRevisionException;
 import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy;
 import org.eclipse.emf.cdo.protocol.revision.CDORevision;
 import org.eclipse.emf.cdo.protocol.util.TransportException;
@@ -28,6 +29,7 @@ import org.eclipse.emf.internal.cdo.protocol.LoadRevisionByVersionRequest;
 import org.eclipse.emf.internal.cdo.protocol.LoadRevisionRequest;
 
 import org.eclipse.net4j.channel.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.internal.util.om.trace.PerfTracer;
 import org.eclipse.net4j.signal.failover.IFailOverStrategy;
 
@@ -40,6 +42,8 @@ import java.util.List;
  */
 public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements CDORevisionManager
 {
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, CDORevisionManagerImpl.class);
+
   private static final PerfTracer LOADING = new PerfTracer(OM.PERF_REVISION_LOADING, CDORevisionManagerImpl.class);
 
   private CDOSessionImpl session;
@@ -56,6 +60,22 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C
     return session;
   }
 
+  @Override
+  public void addRevision(CDORevisionImpl revision) throws CDODuplicateRevisionException
+  {
+    try
+    {
+      super.addRevision(revision);
+    }
+    catch (CDODuplicateRevisionException ignore)
+    {
+      if (TRACER.isEnabled())
+      {
+        TRACER.trace("Ignorable exception on client side", ignore);
+      }
+    }
+  }
+
   public CDOID resolveReferenceProxy(CDOReferenceProxy referenceProxy)
   {
     // Get proxy values