[
https://issues.apache.org/jira/browse/OAK-1029?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Michael Dürig resolved OAK-1029.
--------------------------------
Resolution: Fixed
Fixed at http://svn.apache.org/r1524941
> ConflictAnnotatingRebaseDiff reports spurious changeDeletedNode conflicts
> --------------------------------------------------------------------------
>
> Key: OAK-1029
> URL: https://issues.apache.org/jira/browse/OAK-1029
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: core
> Reporter: Michael Dürig
> Assignee: Michael Dürig
>
> This is caused by OAK-914: now {{NodeStateDiff#childNodeChanged}} might get
> called even tough before and after states are equal. We need to special case
> this in {{AbstractRebaseDiff#childNodeChanged}}.
--
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
