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 "Alex Parvulescu (JIRA)" <ji...@apache.org> on 2017/06/02 15:53:04 UTC
[jira] [Comment Edited] (OAK-3381) Provide Common Ancestor To
ConflictHandler
[ https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16034897#comment-16034897 ]
Alex Parvulescu edited comment on OAK-3381 at 6/2/17 3:52 PM:
--------------------------------------------------------------
attaching a new version, this time I've introduced a proper replacement interface and added the base to all methods.
this is the WIP branch, if anyone prefers github: https://github.com/apache/jackrabbit-oak/compare/trunk...stillalex:oak-3381
there is no ref to OAK-337 anymore, this is tracked in a dedicated branch based on this work (https://github.com/stillalex/jackrabbit-oak/commit/a56462622614193204094ffe2ac41d7883f2d0f5).
[~mduerig] whenever you have some spare cycles!
was (Author: alex.parvulescu):
attaching a new version, this time I've introduced a proper replacement interface and added the base to all methods.
this is the WIP branch, if anyone prefers github: https://github.com/apache/jackrabbit-oak/compare/trunk...stillalex:oak-3381
there is no ref to OAK-337 anymore, I'll add a dedicated branch for that patch based on this work.
[~mduerig] whenever you have some spare cycles!
> 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)