[ 
https://issues.apache.org/jira/browse/OAK-6491?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Alex Deparvu resolved OAK-6491.
-------------------------------
    Resolution: Fixed

I took the opportunity to refactor this conflict handler to use the new apis, 
and moved the existing tests to their proper package (the move confused svn so 
I had to do it in 2 commits).

Fixed with http://svn.apache.org/viewvc?rev=1802922&view=rev and 
http://svn.apache.org/viewvc?rev=1802923&view=rev

> Add JCR_CREATED support to JcrLastModifiedConflictHandler
> ---------------------------------------------------------
>
>                 Key: OAK-6491
>                 URL: https://issues.apache.org/jira/browse/OAK-6491
>             Project: Jackrabbit Oak
>          Issue Type: Improvement
>          Components: core
>            Reporter: Alex Deparvu
>            Assignee: Alex Deparvu
>             Fix For: 1.7.5
>
>
> Currently the {{JcrLastModifiedConflictHandler}} only handles 
> {{JCR_LASTMODIFIED}} updates by picking the newer of the 2 dates. I suggest 
> to improve this by adding support for the {{JCR_CREATED}} concurrent updates, 
> except the merge would pick the first of the 2 date properties.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Reply via email to