[
https://issues.apache.org/jira/browse/OAK-536?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13549731#comment-13549731
]
Michael Dürig commented on OAK-536:
-----------------------------------
Here is a POC implementation on how to use this from oak-core:
https://github.com/mduerig/jackrabbit-oak/commit/14b5ee334ce51876fc5b7f462904c2cbcd5ed3e9
I commented out a few test cases which fail now. These failures are caused by
the Microkernel rebase implementation just throwing an exception when it
detects a conflict. The oak-core rebase implementations in contrast annotate
such conflicts with conflict markers. This is something which we can easily add
to the Microkernel rebase implementation but which is not necessary for
comparing the overall effects of the various implementations.
> 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
