[
https://issues.apache.org/jira/browse/OAK-133?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13290982#comment-13290982
]
Michael Dürig commented on OAK-133:
-----------------------------------
On a more detailed account here is what I'd like to do:
If {{Session.refresh(true)}} encounters a conflict on child node {{n}} of
parent {{p}}, it sets {{n}} to a conflict maker node in {{p}}. That conflict
marker node would essentially contain the original node how it was before
{{Session.refresh}} and the new node how it looked at the persisted state at
the time of {{Session.refresh}}. The presence of conflict marker nodes would
prevent the session from being saved (e.g. via a commit hook) but would allow
clients to manually clean things up and save the session then.
> Session.refresh(true) should allow for manual conflict reconciliation
> ---------------------------------------------------------------------
>
> Key: OAK-133
> URL: https://issues.apache.org/jira/browse/OAK-133
> Project: Jackrabbit Oak
> Issue Type: New Feature
> Components: core
> Reporter: Michael Dürig
>
> There should be a way for manual reconciliation of conflicts which
> {{Session.refresh(true)}} cannot handle automatically. See OAK-131 for one
> such case and Jukka's proposal for using conflict markers for such cases [1].
> [1] http://markmail.org/message/qogspnyao5yjwl45
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
