You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/09/20 10:33:06 UTC

svn commit: r1524941 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java

Author: mduerig
Date: Fri Sep 20 08:33:06 2013
New Revision: 1524941

URL: http://svn.apache.org/r1524941
Log:
OAK-1029: ConflictAnnotatingRebaseDiff reports spurious changeDeletedNode conflicts

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java?rev=1524941&r1=1524940&r2=1524941&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiff.java Fri Sep 20 08:33:06 2013
@@ -217,6 +217,8 @@ public abstract class AbstractRebaseDiff
             String name, NodeState before, NodeState after) {
         if (builder.hasChildNode(name)) {
             after.compareAgainstBaseState(before, createDiff(builder, name));
+        } else if (after.equals(before)) {
+            return false;
         } else {
             changeDeletedNode(builder, name, after);
         }