Author: mduerig
Date: Sun Mar 23 20:10:26 2014
New Revision: 1580588
URL: http://svn.apache.org/r1580588
Log:
OAK-1553: More sophisticated conflict resolution when concurrently adding nodes
Updated contract for addExistingNode conflict
Modified:
jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Modified:
jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1580588&r1=1580587&r2=1580588&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
(original)
+++
jackrabbit/oak/trunk/oak-mk-api/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Sun Mar 23 20:10:26 2014
@@ -526,8 +526,9 @@ public interface MicroKernel {
* <dd>A property has been changed while a property of the same name
has been changed to a
* different value in trunk.</dd>
* <dt>addExistingNode:</dt>
- * <dd>A node has been added that is different from a node of them
same name that has been added
- * to the trunk.</dd>
+ * <dd>A node has been added that can't be merged with a node of them
same name that has
+ * been added to the trunk. How and whether merging takes place is
up to the
+ * implementation. Merging must not cause data to be lost
however.</dd>
* <dt>deleteDeletedNode:</dt>
* <dd>A node has been removed while a node of the same name has been
removed in trunk.</dd>
* <dt>deleteChangedNode:</dt>
