[
https://issues.apache.org/jira/browse/OAK-2287?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Alex Parvulescu updated OAK-2287:
---------------------------------
Attachment: OAK-2287.patch
Attaching a rough patch, just to not forget about it.
On oak-dev a bigger refactoring of the conflict handler class was suggested, I
did not start with this.
I also think it might make sense to make this into a more generic type of
conflict handling: let's say for a specific date property I could automatically
merge by selecting the newer _or_ the older one based on a flag: so for
jcr:lastModified I would pick the newer one, but I could apply the same logic
for jcr:created, except I would merge by picking the oldest of the 2.
> 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)