[
https://issues.apache.org/jira/browse/OAK-2287?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14224234#comment-14224234
]
Michael Dürig commented on OAK-2287:
------------------------------------
Patch looks good so far. The part I'm not too sure about is when the conflict
involves a deleted property (i.e. {{changeChangedProperty}},
{{deleteDeletedProperty}} and {{deleteChangedProperty}}). An other option would
be to delegate to the previous handler in the chain instead of resolving to
{{THEIRS}} as this would be more consistent with the behaviour of other
conflicts.
> ConflictHandler for merging jcr:lastModified
> --------------------------------------------
>
> Key: OAK-2287
> URL: https://issues.apache.org/jira/browse/OAK-2287
> Project: Jackrabbit Oak
> Issue Type: Improvement
> Components: core, jcr
> Reporter: Alex Parvulescu
> Assignee: Alex Parvulescu
> Priority: Minor
> Attachments: OAK-2287.patch
>
>
> As discussed on oak-dev, 'jcr:lastModified' is a date property and it
> represents the last modification date. It makes sense to merge concurrent
> updates by picking the newer date of the 2 options.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
