[
https://issues.apache.org/jira/browse/OAK-374?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13502704#comment-13502704
]
Michael Dürig commented on OAK-374:
---
A side effect of this is that transient changes are now all kept in memory
after a rebase. This is the case since the logic which purges changes to the
underlying branch is in {{TreeImpl}}.
> ConflictHandler must not depend on Oak API
> --
>
> Key: OAK-374
> URL: https://issues.apache.org/jira/browse/OAK-374
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: core
>Affects Versions: 0.5
>Reporter: Marcel Reutegger
>Assignee: Marcel Reutegger
>Priority: Minor
> Fix For: 0.6
>
> Attachments: OAK-374.patch
>
>
> This is a follow up issue for OAK-197 and required for OAK-169. The current
> ConflictHandler interface uses both Tree and NodeState parameters in its
> methods and therefore mixes different levels of abstraction.
> ConflictHandlers are not part of the Oak API anymore and should only rely on
> NodeState instead of Tree.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira