[
https://issues.apache.org/jira/browse/OAK-3381?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16042974#comment-16042974
]
angela edited comment on OAK-3381 at 6/8/17 4:33 PM:
-----------------------------------------------------
[~alex.parvulescu], i like the appoach! so far i only spotted minor issues:
* {{AnnotatingConflictHandler}}: broken link in javadoc
* {{AsyncIndexUpdate}}: unused import to
{{org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter}} (maybe old?)
* {{CompositeConflictHandler}}: broken link in javadoc
* {{ConflictHandlers}}: TODO left
* {{DefaultThreeWayConflictHandler}}:
** i would also add the annotations here (just to improve readability of the
code)
** typo in the TODO ;-)... regarding the TODO: not sure about moving unless we
have a compelling reason to the spi package space and expect this to be
'widely' used
* {{MergingNodeStateDiff}}:
** unused import
** what was the reason for adding {{Preconditions.checkNotNull(ours);}} with
the {{propertyConflictHandlers}}? to me that looks unrelated to the issue at
hand. am i mistaken?
was (Author: anchela):
like the appoach! so far i only spotted minor issues:
* {{AnnotatingConflictHandler}}: broken link in javadoc
* {{AsyncIndexUpdate}}: unused import to
{{org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter}} (maybe old?)
* {{CompositeConflictHandler}}: broken link in javadoc
* {{ConflictHandlers}}: TODO left
* {{DefaultThreeWayConflictHandler}}:
** i would also add the annotations here (just to improve readability of the
code)
** typo in the TODO ;-)... regarding the TODO: not sure about moving unless we
have a compelling reason to the spi package space and expect this to be
'widely' used
* {{MergingNodeStateDiff}}:
** unused import
** what was the reason for adding {{Preconditions.checkNotNull(ours);}} with
the {{propertyConflictHandlers}}? to me that looks unrelated to the issue at
hand. am i mistaken?
> 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
>
> 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)
