You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-issues@jackrabbit.apache.org by "Marcel Reutegger (JIRA)" <ji...@apache.org> on 2013/05/29 15:39:21 UTC
[jira] [Resolved] (OAK-846) Branch conflicts not detected by
MongoMK
[ https://issues.apache.org/jira/browse/OAK-846?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Marcel Reutegger resolved OAK-846.
----------------------------------
Resolution: Fixed
Fix Version/s: 0.9
Fixed in revision: 1487481.
> Branch conflicts not detected by MongoMK
> ----------------------------------------
>
> Key: OAK-846
> URL: https://issues.apache.org/jira/browse/OAK-846
> Project: Jackrabbit Oak
> Issue Type: Bug
> Components: mongomk
> Affects Versions: 0.8
> Reporter: Marcel Reutegger
> Assignee: Marcel Reutegger
> Priority: Minor
> Fix For: 0.9
>
>
> MongoMK does not correctly detect conflicts when changes are committed into multiple branches concurrently and then merged back.
> ConflictTest already covers conflict detection for non-branch commits and mixed branch/non-branch changes, but is missing tests for conflicting branches. I'll commit an ignored test to illustrate the problem.
--
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