[
https://issues.apache.org/jira/browse/OAK-536?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13554995#comment-13554995
]
Thomas Mueller commented on OAK-536:
------------------------------------
A question about the conflict annotations: could a similar mechanism be used
for the commit and merge methods? Because those methods also need to deal with
conflicts, not (just) rebase. Instead of changing the nodes, could we list the
conflicts in the exception, similar to BatchUpdateException? See
http://docs.oracle.com/javase/7/docs/api/java/sql/BatchUpdateException.html -
by extending the MicroKernelException:
MicroKernelConflictException.getConflicts() with the list of conflicts (Json
format of course).
> Implement rebase for branches in Microkernel
> --------------------------------------------
>
> Key: OAK-536
> URL: https://issues.apache.org/jira/browse/OAK-536
> Project: Jackrabbit Oak
> Issue Type: Improvement
> Components: mk, mongomk
> Reporter: Michael Dürig
> Attachments: OAK-536.patch, OAK-536.patch
>
>
> As discussed at length in OAK-464 and on the
> [list|http://markmail.org/message/4xwfwbax3kpoysbp], having the ability to
> rebase Microkernel branches on top of a different revision than the one the
> branch was originally branched from, helps for resolving conflicts. Both in
> the distributed cluster case and for concurrent commits from user sessions.
> Since we didn't come to a conclusion where this functionality should be best
> implemented, I did a [POC
> implementation|https://github.com/mduerig/jackrabbit-oak/commit/42e8d60132ca2207c03fa79fd1ddca22406fc58a]
> for oak-core in OAK-464. In order to make an informed decision on how to
> proceed we should also POC this functionality for the Microkernel.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
