jackrabbit-oak-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Dürig (JIRA) <j...@apache.org>
Subject [jira] [Comment Edited] (OAK-536) Implement rebase for branches in Microkernel
Date Fri, 25 Jan 2013 21:07:12 GMT

    [ https://issues.apache.org/jira/browse/OAK-536?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13563035#comment-13563035
] 

Michael Dürig edited comment on OAK-536 at 1/25/13 9:05 PM:
------------------------------------------------------------

[Here|https://github.com/mduerig/jackrabbit-oak/commit/0bbeac9677c1f149fa1c6fbffb07e8b95941f5c3]
is the same rebase implementation for the Mongo Microkernel like I did [before|https://issues.apache.org/jira/browse/OAK-536?focusedCommentId=13553704&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13553704]
for the H2 MicroKernel.
                
      was (Author: mduerig):
    [Here|https://github.com/mduerig/jackrabbit-oak/commit/0bbeac9677c1f149fa1c6fbffb07e8b95941f5c3]
is the same rebase implementation for the Mongo Microkernel like I did [before|https://issues.apache.org/jira/browse/OAK-536?focusedCommentId=13549731&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13549731]
for the H2 MicroKernel.
                  
> 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

Mime
View raw message