svn commit: r1578293 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java

[mduerig]

Author: mduerig
Date: Mon Mar 17 10:42:47 2014
New Revision: 1578293

URL: http://svn.apache.org/r1578293
Log:
OAK-1549: AbstractRebaseDiff incorrectly handles conflict in added nodes
@Ignored test case

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java?rev=1578293&r1=1578292&r2=1578293&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractRebaseDiffTest.java
 Mon Mar 17 10:42:47 2014
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTru
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class AbstractRebaseDiffTest {
@@ -152,12 +153,15 @@ public class AbstractRebaseDiffTest {
     }
 
     @Test
+    @Ignore("OAK-1549")
     public void addExistingNode() {
         NodeBuilder headBuilder = base.builder();
+        headBuilder.setChildNode("n");
         headBuilder.setChildNode("m");
         NodeState head = headBuilder.getNodeState();
 
         NodeBuilder branchBuilder = base.builder();
+        branchBuilder.setChildNode("n");
         branchBuilder.setChildNode("m").setChildNode("mm");
         NodeState branch = branchBuilder.getNodeState();