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 2012/11/23 14:10:58 UTC

[jira] [Resolved] (OAK-469) KernelNodeStoreBranch should reset the head of the current branch after a failed merge

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

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

       Resolution: Fixed
    Fix Version/s: 0.6
         Assignee: Michael Dürig

Fixed at revision 1412865
                
> KernelNodeStoreBranch should reset the head of the current branch after a failed merge
> --------------------------------------------------------------------------------------
>
>                 Key: OAK-469
>                 URL: https://issues.apache.org/jira/browse/OAK-469
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>          Components: core
>            Reporter: Michael Dürig
>            Assignee: Michael Dürig
>             Fix For: 0.6
>
>
> When {{KernelNodeStoreBranch.merge}} fails, the head of the current branch is currently left at the wrong state. Namely at the state which has been generated by the commit hook. It should instead be reset to the state it had before the commit hook ran.

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