jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1236165 - /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
Date Thu, 26 Jan 2012 13:03:45 GMT
Author: stefan
Date: Thu Jan 26 13:03:44 2012
New Revision: 1236165

URL: http://svn.apache.org/viewvc?rev=1236165&view=rev
Log:
fixed c&p error in 3-way merge conflict resolution

Modified:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1236165&r1=1236164&r2=1236165&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
Thu Jan 26 13:03:44 2012
@@ -400,11 +400,11 @@ public class CommitBuilder {
                     break;
                 }
 
-                case REMOVED_DIRTY_NODE_CONFLICT:
+                case REMOVED_DIRTY_PROPERTY_CONFLICT:
                     mergedNode.getProperties().remove(conflictName);
                     break;
 
-                case REMOVED_DIRTY_PROPERTY_CONFLICT:
+                case REMOVED_DIRTY_NODE_CONFLICT:
                     mergedNode.remove(conflictName);
                     break;
             }



Mime
View raw message