[
https://issues.apache.org/jira/browse/OAK-8310?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Marcel Reutegger resolved OAK-8310.
-----------------------------------
Resolution: Fixed
Fix Version/s: 1.14.0
Fixed in trunk: http://svn.apache.org/r1859020
The exception message now says '... already existed in revision ...' instead of
'... was already added in revision ...'.
> Potentially misleading conflict exception message
> -------------------------------------------------
>
> Key: OAK-8310
> URL: https://issues.apache.org/jira/browse/OAK-8310
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: documentmk
> Affects Versions: 1.8.0, 1.10.0, 1.12.0
> Reporter: Marcel Reutegger
> Assignee: Marcel Reutegger
> Priority: Minor
> Fix For: 1.14.0
>
>
> A conflicting merge on a DocumentNodeStore may have a misleading exception
> message, when a node is added that already exists and the existing node has
> changes that were done after it was added.
> The conflict message will then say there's an existing node that was added at
> the revision it was last modified instead of when it was added.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
