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 2014/02/13 16:26:19 UTC

[jira] [Commented] (OAK-1185) DocumentNodeStore: annotate conflicts

    [ https://issues.apache.org/jira/browse/OAK-1185?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13900423#comment-13900423 ] 

Marcel Reutegger commented on OAK-1185:
---------------------------------------

Conflict annotation for InMemory branch merges is implemented, but is still missing for Persisted branch merges. In the latter case the behavior is slightly different. A branch with conflicts is marked with a collision tag on the commit root document. This prevents merging the branch back. There are two possible resolutions when a branch is in this state:

# the branch is reset to a revision without conflicts. This may work when the conflicts on the branch were introduced by commit editors. A merge can be retried by a reset, rebase and running the commit editors again.
# the changes on the branch are discarded. i.e. with Session.refresh(false) and the changes are retried on the application level.

> DocumentNodeStore: annotate conflicts
> -------------------------------------
>
>                 Key: OAK-1185
>                 URL: https://issues.apache.org/jira/browse/OAK-1185
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>          Components: core, mongomk
>            Reporter: Marcel Reutegger
>            Assignee: Marcel Reutegger
>             Fix For: 1.0
>
>
> Conflict handling is mostly implemented in MongoMK but it does not yet annotate conflicts on rebase.



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)