Index: oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java	(revision 3ed1feaa805e0d86bd481bdea8f5d983c5abdc15)
+++ oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java	(revision )
@@ -555,13 +555,13 @@
                 }
             }
         } else if (beforeChildName != Template.MANY_CHILD_NODES) {
-            boolean beforeChildStillExists = false;
+            boolean beforeChildRemoved = true;
             for (ChildNodeEntry entry
                     : afterTemplate.getChildNodeEntries(afterId)) {
                 String childName = entry.getName();
-                beforeChildStillExists |= childName.equals(beforeChildName);
                 NodeState afterChild = entry.getNodeState();
                 if (beforeChildName.equals(childName)) {
+                    beforeChildRemoved = false;
                     NodeState beforeChild =
                             beforeTemplate.getChildNode(beforeChildName, beforeId);
                     if (beforeChild.exists()) {
@@ -579,7 +579,7 @@
                     return false;
                 }
             }
-            if (!beforeChildStillExists) {
+            if (beforeChildRemoved) {
                 NodeState beforeChild =
                         beforeTemplate.getChildNode(beforeChildName, beforeId);
                 if (!diff.childNodeDeleted(beforeChildName, beforeChild)) {