Examples of org.apache.jackrabbit.mk.api.MicroKernel.merge()

Class org.apache.jackrabbit.mk.api.MicroKernel

Examples of org.apache.jackrabbit.mk.api.MicroKernel.merge()

org.apache.jackrabbit.mk.api.MicroKernel.merge()
Merges the specified private branch revision with the current head revision.
A {@code MicroKernelException} is thrown if {@code branchRevisionId} doesn'texist, if it's not a branch revision, if the merge fails because of conflicting changes or if another error occurs. @param branchRevisionId id of private branch revision @param message commit message @return id of newly created head revision @throws MicroKernelException if {@code branchRevisionId} doesn't exist,if it's not a branch revision, if the merge fails because of conflicting changes or if another error occurs. @see #branch(String)

        NodeState oldRoot = store.getRoot();
        NodeState toCommit = editor.editCommit(store, oldRoot, currentRoot);
        setRoot(toCommit);


        try {
            String mergedRevision = kernel.merge(branchRevision, null);
            branchRevision = null;
            currentRoot = null;
            committed = null;
            KernelNodeState committed = new KernelNodeState(kernel, getValueFactory(), "/", mergedRevision);
            return committed;

View Full Code Here

        NodeState oldRoot = base;
        NodeState toCommit = editor.editCommit(store, oldRoot, currentRoot);
        setRoot(toCommit);


        try {
            String mergedRevision = kernel.merge(branchRevision, null);
            branchRevision = null;
            currentRoot = null;
            committed = null;
            KernelNodeState committed = new KernelNodeState(kernel, "/", mergedRevision);
            return committed;

View Full Code Here

                currentRoot = null;
                return committed;
            }
            else {
                MicroKernel kernel = store.getKernel();
                String mergedRevision = kernel.merge(branchRevision, null);
                branchRevision = null;
                currentRoot = null;
                return store.getRootState(mergedRevision);
            }
        }

View Full Code Here

                    head.compareAgainstBaseState(store.getRootState(headRevision), diff);
                    String jsop = diff.toString();
                    if (!jsop.isEmpty()) {
                        headRevision = kernel.commit("", jsop, headRevision, null);
                    }
                    newRevision = kernel.merge(headRevision, null);
                    headRevision = null;
                }
                head = null;  // Mark as merged
                return store.getRootState(newRevision);
            }

View Full Code Here

                head = null;  // Mark as merged
                return base;
            }
            else {
                MicroKernel kernel = store.getKernel();
                String mergedRevision = kernel.merge(headRevision, null);
                headRevision = null;
                head = null;  // Mark as merged
                return store.getRootState(mergedRevision);
            }
        }

View Full Code Here

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.