Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java	(revision 903657)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java	(working copy)
@@ -170,7 +170,7 @@
         // remove the child nodes in N but not in N'
         LinkedList<ChildNodeEntry> toDelete = new LinkedList<ChildNodeEntry>();
         for (ChildNodeEntry entry: state.getState().getChildNodeEntries()) {
-            if (!srcNode.getState().hasChildNodeEntry(entry.getName(), entry.getIndex())) {
+            if (!srcNode.getState().hasChildNodeEntry(entry.getName(), entry.getIndex()) || !srcNode.getState().hasChildNodeEntry(entry.getId())) {
                 toDelete.add(entry);
             }
         }