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

Michael Dürig commented on OAK-464:
-----------------------------------

bq. In JukkasProposal there is no parsing required. 

Yes, I chose a slightly more fine grained approach in order to be able to 
resolve certain types of conflicts in oak-core. Jukka's proposal only relies on 
conflict resolution in the Microkernel. Note however, that even for Jukka's 
approach the journal would have to be parsed. Only the individual changes would 
not have to be parsed. Or else, how would you implement 
{{getBranchCommitsUntil()}} in oak-core?
Feel free to submit a patch which closer matches Jukka's proposal. 
                
> RootImpl.rebase() doesn't handle move operations correctly
> ----------------------------------------------------------
>
>                 Key: OAK-464
>                 URL: https://issues.apache.org/jira/browse/OAK-464
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>            Reporter: Michael Dürig
>
> Doing {{RootImpl.rebase()}} causes moves to be changed to remove followed by 
> add. Which causes moves of large sub trees to become very expensive.

--
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

Reply via email to