jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1236234 - /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
Date Thu, 26 Jan 2012 15:18:16 GMT
Author: stefan
Date: Thu Jan 26 15:18:16 2012
New Revision: 1236234

URL: http://svn.apache.org/viewvc?rev=1236234&view=rev
Log:
added todo reminder for handling competing deletes etc

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=1236234&r1=1236233&r2=1236234&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 15:18:16 2012
@@ -181,6 +181,7 @@ public class CommitBuilder {
 
         String currentHead = store.getHeadCommitId();
         if (!currentHead.equals(baseRevId)) {
+            // todo gracefully handle certain conflicts (e.g. changes on moved sub-trees,
competing deletes etc)
             // update base revision to new head
             baseRevId = currentHead;
             // clear staging area



Mime
View raw message