jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1373445 - in /jackrabbit/oak/trunk/oak-core/src/main: java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd
Date Wed, 15 Aug 2012 15:03:59 GMT
Author: mduerig
Date: Wed Aug 15 15:03:59 2012
New Revision: 1373445

URL: http://svn.apache.org/viewvc?rev=1373445&view=rev
Log:
OAK-242: Mixin rep:MergeConflict is not a registered node type

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java?rev=1373445&r1=1373444&r2=1373445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/AnnotatingConflictHandler.java
Wed Aug 15 15:03:59 2012
@@ -41,7 +41,7 @@ import static org.apache.jackrabbit.oak.
  * [rep:MergeConflict]
  *   mixin
  *   primaryitem rep:ours
- *   + rep:ours (nt:unstructured)
+ *   + rep:ours (nt:unstructured) protected IGNORE
  * </pre>
  *
  * The {@code rep:ours} sub node contains our version of the node prior to

Modified: jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd?rev=1373445&r1=1373444&r2=1373445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd
Wed Aug 15 15:03:59 2012
@@ -648,3 +648,11 @@
   - rep:hold (UNDEFINED) protected  multiple IGNORE
   - rep:retentionPolicy (UNDEFINED) protected IGNORE
 
+// -----------------------------------------------------------------------------
+// Oak save conflict resolution
+// -----------------------------------------------------------------------------
+
+[rep:MergeConflict]
+  mixin
+  primaryitem rep:ours
+  + rep:ours (nt:unstructured) protected IGNORE



Mime
View raw message