You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-issues@jackrabbit.apache.org by "Michael Dürig (JIRA)" <ji...@apache.org> on 2013/02/27 15:07:13 UTC

[jira] [Resolved] (OAK-157) Incorrect rebase/edit/merge logic

     [ https://issues.apache.org/jira/browse/OAK-157?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Michael Dürig resolved OAK-157.
-------------------------------

       Resolution: Fixed
    Fix Version/s: 0.7

The remaining issues is covered with OAK-464
                
> Incorrect rebase/edit/merge logic
> ---------------------------------
>
>                 Key: OAK-157
>                 URL: https://issues.apache.org/jira/browse/OAK-157
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>          Components: core
>            Reporter: Jukka Zitting
>             Fix For: 0.7
>
>
> When working on OAK-154 and adding our first commit hook that modifies the incoming commit we encountered some problems with the way the KernelNodeStoreBranch class handles the somewhat tricky rebase/edit/merge case.
> The most pressing issue is that the merge() call ends up in an infinite loop whenever the configured CommitEditor returns anything that's not equal to the "after" argument it was given.

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