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

["Michael Dürig (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16042716#comment-16042716 ] 

Michael Dürig commented on OAK-3381:
------------------------------------

Nice! I like how {{ThreeWayConflictHandler}} is the new way to go and the neat wrapping of the now deprecated conflict handlers. This approach looks much cleaner. I also like the deprecation of {{PartialConflictHandler}}. The new approach where a conflict handler can return IGNORED as resolution is *much* cleaner.

Two minor points: I noticed that there are a couple of broken Javadoc links introduced with this patch. Furthermore I would remove the comments re. "former" null where IGNORED is now used. This comment is helpful now during the transition but will be pretty much confusing further down the line. 

> 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: Michael Dürig
>             Fix For: 1.8
>
>         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.3.15#6346)