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 2014/03/17 11:44:43 UTC

[jira] [Resolved] (OAK-1549) AbstractRebaseDiff incorrectly handles conflict in added nodes

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

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

    Resolution: Fixed

Fixed at http://svn.apache.org/r1578294

> AbstractRebaseDiff incorrectly handles conflict in added nodes
> --------------------------------------------------------------
>
>                 Key: OAK-1549
>                 URL: https://issues.apache.org/jira/browse/OAK-1549
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>            Reporter: Michael Dürig
>            Assignee: Michael Dürig
>             Fix For: 0.19
>
>
> {{AbstractRebaseDiff#addExistingNode}} reports a conflict if a node of the *same name* is added to the parent. {{MicroKernel#rebase}} however specifies: "addExistingNode: A node has been added that is different from a node of them same name that has been added to the trunk.



--
This message was sent by Atlassian JIRA
(v6.2#6252)