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 C966AD4DB for ; Tue, 18 Dec 2012 14:43:58 +0000 (UTC) Received: (qmail 36291 invoked by uid 500); 18 Dec 2012 14:43:58 -0000 Delivered-To: apmail-jackrabbit-oak-dev-archive@jackrabbit.apache.org Received: (qmail 36184 invoked by uid 500); 18 Dec 2012 14:43:58 -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 36174 invoked by uid 99); 18 Dec 2012 14:43:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 14:43:58 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of mueller@adobe.com designates 64.18.1.238 as permitted sender) Received: from [64.18.1.238] (HELO exprod6og122.obsmtp.com) (64.18.1.238) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 14:43:50 +0000 Received: from outbound-smtp-2.corp.adobe.com ([193.104.215.16]) by exprod6ob122.postini.com ([64.18.5.12]) with SMTP ID DSNKUNCBEWUGW4fI6k/1ur08cqhcynKaF9ws@postini.com; Tue, 18 Dec 2012 06:43:29 PST Received: from inner-relay-4.eur.adobe.com (inner-relay-4b [10.128.4.237]) by outbound-smtp-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id qBIEhSuN006770 for ; Tue, 18 Dec 2012 06:43:28 -0800 (PST) Received: from nacas01.corp.adobe.com (nacas01.corp.adobe.com [10.8.189.99]) by inner-relay-4.eur.adobe.com (8.12.10/8.12.9) with ESMTP id qBIEhHXS004443 for ; Tue, 18 Dec 2012 06:43:27 -0800 (PST) Received: from eurhub01.eur.adobe.com (10.128.4.30) by nacas01.corp.adobe.com (10.8.189.99) with Microsoft SMTP Server (TLS) id 8.3.279.1; Tue, 18 Dec 2012 06:43:21 -0800 Received: from eurmbx01.eur.adobe.com ([10.128.4.32]) by eurhub01.eur.adobe.com ([10.128.4.30]) with mapi; Tue, 18 Dec 2012 14:43:20 +0000 From: Thomas Mueller To: "oak-dev@jackrabbit.apache.org" Date: Tue, 18 Dec 2012 14:43:23 +0000 Subject: Re: Conflict handling in Oak Thread-Topic: Conflict handling in Oak Thread-Index: Ac3dLgXduIp1LVuoQ/KAEuatJ1RAXA== Message-ID: In-Reply-To: <50D07F1E.9070704@apache.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.2.5.121010 acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org Hi, >>>2) Allow inconsistent journals. >> >> I guess we don't want that. But the question is how close the journal >>has >> to match the original commit, specially "move" and "copy" operations. If >> they need to be preserved (do they?), then it's complicated. > >There is no use for a journal which is not accurate. After all, if we >consider implementing rebase (OAK-464) on top of the journal, it has to >be accurate. Yes, I think we should have a consistent journal, if we have a journal. But the question is how close the journal has to match the original commit, specially "move" and "copy" operations. So, do "move" and "copy" operations need to be preserved, or can they be converted to "add node" / "remove node"? Regards, Thomas