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 58F45C80B for ; Tue, 23 Jul 2013 09:30:17 +0000 (UTC) Received: (qmail 19621 invoked by uid 500); 23 Jul 2013 09:30:16 -0000 Delivered-To: apmail-jackrabbit-oak-dev-archive@jackrabbit.apache.org Received: (qmail 19586 invoked by uid 500); 23 Jul 2013 09:30:16 -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 19571 invoked by uid 99); 23 Jul 2013 09:30:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 09:30:15 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: local policy) Received: from [64.18.1.191] (HELO exprod6og106.obsmtp.com) (64.18.1.191) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 09:30:08 +0000 Received: from outbound-smtp-2.corp.adobe.com ([193.104.215.16]) by exprod6ob106.postini.com ([64.18.5.12]) with SMTP ID DSNKUe5M994iWyQPj9DfBUNFgHcHdu/fHpzZ@postini.com; Tue, 23 Jul 2013 02:29:48 PDT Received: from inner-relay-2.corp.adobe.com (mail-321.pac.adobe.com [153.32.1.52]) by outbound-smtp-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id r6N9TPAI007146 for ; Tue, 23 Jul 2013 02:29:26 -0700 (PDT) Received: from nacas02.corp.adobe.com (nacas02.corp.adobe.com [10.8.189.100]) by inner-relay-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id r6N9TPw7017754 for ; Tue, 23 Jul 2013 02:29:25 -0700 (PDT) Received: from eurhub01.eur.adobe.com (10.128.4.30) by nacas02.corp.adobe.com (10.8.189.100) with Microsoft SMTP Server (TLS) id 8.3.298.1; Tue, 23 Jul 2013 02:29:25 -0700 Received: from susi.eur.adobe.com (10.132.1.203) by eurhub01.eur.adobe.com (10.128.4.111) with Microsoft SMTP Server id 8.3.298.1; Tue, 23 Jul 2013 10:29:23 +0100 Message-ID: <51EE4CF2.3030302@apache.org> Date: Tue, 23 Jul 2013 11:29:22 +0200 From: =?ISO-8859-1?Q?Michael_D=FCrig?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: Subject: Re: Conflict handling causes spurious observation events References: <51E962BA.7040903@apache.org> <51ED0AFC.5080901@apache.org> <51ED1433.6070203@gmail.com> In-Reply-To: <51ED1433.6070203@gmail.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org On 22.7.13 13:14, Michael D�rig wrote: > - explicitly synchronise in the case of the MircorKernel based > implementations. As Chetan mentions in the other mail, synchronisation alone does not help here. It is still possible to have two not branches merging against the same base revision. I.e. two branches that are not rebased on top of the current trunk and "merge internally". IFAICS it is also necessary for NodeStoreBranch.merge() to rebase the branch. I'll give this a try. Michael