You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2012/04/18 17:56:53 UTC

svn commit: r1327553 - /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java

Author: stefan
Date: Wed Apr 18 15:56:53 2012
New Revision: 1327553

URL: http://svn.apache.org/viewvc?rev=1327553&view=rev
Log:
 OAK-45: Add support for branching and merging of private copies to MicroKernel (WIP)

Modified:
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1327553&r1=1327552&r2=1327553&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java Wed Apr 18 15:56:53 2012
@@ -97,6 +97,10 @@ public class CommitBuilder {
         }
 
         StoredCommit baseCommit = store.getCommit(baseRevId);
+        if (createBranch && baseCommit.getBranchRootId() != null) {
+            throw new Exception("cannot branch off a private branch");
+        }
+
         boolean privateCommit = createBranch || baseCommit.getBranchRootId() != null;