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/09/20 10:32:52 UTC

[jira] [Updated] (OAK-1029) ConflictAnnotatingRebaseDiff reports spurious changeDeletedNode conflicts

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

Michael Dürig updated OAK-1029:
-------------------------------

    Summary: ConflictAnnotatingRebaseDiff reports spurious changeDeletedNode conflicts   (was: ConflictAnnotatingRebaseDiff reports spourious changeDeletedNode conflicts )
    
> ConflictAnnotatingRebaseDiff reports spurious changeDeletedNode conflicts 
> --------------------------------------------------------------------------
>
>                 Key: OAK-1029
>                 URL: https://issues.apache.org/jira/browse/OAK-1029
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>          Components: core
>            Reporter: Michael Dürig
>            Assignee: Michael Dürig
>
> This is caused by OAK-914: now {{NodeStateDiff#childNodeChanged}} might get called even tough before and after states are equal. We need to special case this in {{AbstractRebaseDiff#childNodeChanged}}.

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