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/23 21:26:42 UTC

[jira] [Resolved] (OAK-1574) AbstractRebaseDiff: Implement refined conflict resolution for addExistingNode conflicts

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

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

    Resolution: Fixed

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

More sophisticated merge behaviour when two sessions add a node with the same name concurrently by attempting to merge them:

Two nodes can't be merged if they contain properties of the same name whose values differ or if they contain child nodes of the same name that can't be merged. In that case a conflict marker ({{org.apache.jackrabbit.oak.spi.state.ConflictType}}) is added to the parent node of the property causing the non mergable conflict. 

The result of merging two nodes M and N that can be merged contains
* the union of all properties from M and N,
* all nodes from M whose name is not in N,
* all nodes from N whose name is not in M,
* the results from merging the child nodes whose names are both in M and N.



> AbstractRebaseDiff: Implement refined conflict resolution for addExistingNode conflicts
> ---------------------------------------------------------------------------------------
>
>                 Key: OAK-1574
>                 URL: https://issues.apache.org/jira/browse/OAK-1574
>             Project: Jackrabbit Oak
>          Issue Type: Sub-task
>          Components: core
>            Reporter: Michael Dürig
>            Assignee: Michael Dürig
>             Fix For: 0.20
>
>
> Implement refined conflict resolution for addExistingNode conflicts as defined in the parent issue for the {{AbstractRebaseDiff}}.



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