[505654] Support automatic remerging / multiple merges from the same branch

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

1 files changed, 13 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
index 9764cac2d2..75fe71646e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
@@ -33,6 +33,8 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionCache;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionHandler1;
+import org.eclipse.emf.cdo.transaction.CDOTransactionHandler1.WithUndo;
 import org.eclipse.emf.cdo.transaction.CDOUndoDetector;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOInvalidationPolicy;
@@ -1246,6 +1248,17 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
               transaction.setDirty(false);
             }
 
+            CDOTransactionHandler1[] handlers = transaction.getTransactionHandlers1();
+            for (int i = 0; i < handlers.length; i++)
+            {
+              CDOTransactionHandler1 handler = handlers[i];
+              if (handler instanceof WithUndo)
+              {
+                WithUndo withUndo = (WithUndo)handler;
+                withUndo.undoingObject(transaction, object, featureDelta);
+              }
+            }
+
             return result;
           }
         }