From oak-dev-return-2202-apmail-jackrabbit-oak-dev-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Aug 15 14:58:38 2012 Return-Path: X-Original-To: apmail-jackrabbit-oak-dev-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A33B5D24C for ; Wed, 15 Aug 2012 14:58:38 +0000 (UTC) Received: (qmail 53638 invoked by uid 500); 15 Aug 2012 14:58:38 -0000 Delivered-To: apmail-jackrabbit-oak-dev-archive@jackrabbit.apache.org Received: (qmail 53566 invoked by uid 500); 15 Aug 2012 14:58:38 -0000 Mailing-List: contact oak-dev-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-dev@jackrabbit.apache.org Received: (qmail 53498 invoked by uid 99); 15 Aug 2012 14:58:38 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 14:58:38 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id 0B9F62C5BE4 for ; Wed, 15 Aug 2012 14:58:38 +0000 (UTC) Date: Thu, 16 Aug 2012 01:58:38 +1100 (NCT) From: =?utf-8?Q?Michael_D=C3=BCrig_=28JIRA=29?= To: oak-dev@jackrabbit.apache.org Message-ID: <1057289852.13917.1345042718048.JavaMail.jiratomcat@arcas> In-Reply-To: <521289661.2182.1344873518320.JavaMail.jiratomcat@arcas> Subject: [jira] [Commented] (OAK-242) Mixin rep:MergeConflict is not a registered node type MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OAK-242?page=3Dcom.atlassian.ji= ra.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D1343518= 3#comment-13435183 ]=20 Michael D=C3=BCrig commented on OAK-242: ----------------------------------- IGNORE would be the right value for the OPV flag I guess. In practice this = doesn't matter though, since a node with mix:MergeConflict cannot be saved = and thus not versioned.=20 =20 > Mixin rep:MergeConflict is not a registered node type > ----------------------------------------------------- > > Key: OAK-242 > URL: https://issues.apache.org/jira/browse/OAK-242 > Project: Jackrabbit Oak > Issue Type: Bug > Reporter: angela > > the internal mixin type rep:MergeConflict (aka mix:mergeConflict) is > not registered with the node type manager. > adding the CND definition to the buildin node types list present in > oak-core resources should help. > if doing so i would suggest to review the definition. looking at the > cnd currently present in the javadoc of AnnotatingConflictHandler > i got the impression that it should have the OPV flag set. according to > the cnd definition in jsr 283 the default value is COPY if no OPV-flag=20 > is specified and i am not sure if that is intended. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrato= rs: https://issues.apache.org/jira/secure/ContactAdministrators!default.jsp= a For more information on JIRA, see: http://www.atlassian.com/software/jira