[jira] [Resolved] (OAK-3381) Provide Common Ancestor To ConflictHandler

["Alex Parvulescu (JIRA)" <ji...@apache.org>]

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

Alex Parvulescu resolved OAK-3381.
----------------------------------
       Resolution: Fixed
    Fix Version/s: 1.7.2

applied the patch with http://svn.apache.org/viewvc?rev=1798662&view=rev

[~mduerig], [~anchela] thanks a lot for the feedback and please take a quick look to check all looks good!

> Provide Common Ancestor To ConflictHandler
> ------------------------------------------
>
>                 Key: OAK-3381
>                 URL: https://issues.apache.org/jira/browse/OAK-3381
>             Project: Jackrabbit Oak
>          Issue Type: Improvement
>          Components: core
>    Affects Versions: 1.3.5
>            Reporter: Dominique Jäggi
>            Assignee: Alex Parvulescu
>             Fix For: 1.8, 1.7.2
>
>         Attachments: OAK-3381-v0.patch, OAK-3381-v1.patch
>
>
> currently _ConflictHandler_s are provided _ours_ and _theirs_, reflecting a memory state and persisted state of changes to the same root resulting in a conflict.
> unfortunately the information provided to _ConflictHandlers_ does not include the common ancestor, needed for meaningful change-change merges (three-way merge).
> the core should be enhanced to provide such information to _ConflictHandlers_.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)