From dev-return-2413-daniel=haxx.se@subversion.apache.org Fri Mar 5 17:44:22 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o25GiKOp029245 for ; Fri, 5 Mar 2010 17:44:21 +0100 Received: (qmail 29761 invoked by uid 500); 5 Mar 2010 16:44:16 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 29753 invoked by uid 99); 5 Mar 2010 16:44:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 16:44:16 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [209.85.219.228] (HELO mail-ew0-f228.google.com) (209.85.219.228) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 16:44:07 +0000 Received: by ewy28 with SMTP id 28so541793ewy.33 for ; Fri, 05 Mar 2010 08:43:47 -0800 (PST) Received: by 10.213.1.132 with SMTP id 4mr648174ebf.40.1267807426921; Fri, 05 Mar 2010 08:43:46 -0800 (PST) Received: from tcgws000 (183-019-045-062.static.caiway.nl [62.45.19.183]) by mx.google.com with ESMTPS id 14sm1098512ewy.10.2010.03.05.08.43.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 05 Mar 2010 08:43:46 -0800 (PST) From: "Bert Huijben" To: "'Neels J Hofmeyr'" , References: <4B8CDE1E.8090906@artvps.com> <873a0jf1ns.fsf@stat.home.lan> <6cca3db31003020429p393c5c36qd1e1ec3bd8791ce0@mail.gmail.com> <87fx4ievy1.fsf@stat.home.lan> <6cca3db31003020453g77f4ceb8x2690b3b5917ff97a@mail.gmail.com> <20100302134816.GB19563@jack.stsp.name> <6cca3db31003021339q2c4d0505x701da6ab50422644@mail.gmail.com> <4B90521E.2090005@elego.de> <4B90E0A7.7070409@elego.de> In-Reply-To: <4B90E0A7.7070409@elego.de> Subject: RE: holes in the WC-NG schema? Date: Fri, 5 Mar 2010 17:43:45 +0100 Message-ID: <034301cabc83$0621da60$12658f20$@qqmail.nl> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQK+yOp68lEsg2dBnWKE/YDBMlmUbQHpY0KpAejPOugBmmEN2QKesu76AhC3JEcCC994NwJLtI5uAqaQBHICM/3jtw== Content-Language: nl X-Virus-Checked: Checked by ClamAV on apache.org > -----Original Message----- > From: Neels J Hofmeyr [mailto:neels@elego.de] > Sent: vrijdag 5 maart 2010 11:45 > To: dev@subversion.apache.org > Subject: Re: holes in the WC-NG schema? > > Neels J Hofmeyr wrote: > > I remember someone talking of a hole. It went something like: If a folder is > > copied-here, all its children have locally added status, and I understand > > they refer to the op-root of the add to find out their history, i.e. that > > they are copied. Now what if I replace such a child node with a fresh, new > > node -- it will still think that it's part of the copy-here. Just vague > > memory, haven't verified. This one should be fixed if it turns out to be so. > > Turns out we are aware of this problem. My noob shot at a solution would be > to have an indicator whether a WORKING node is the op-root of an add. > Then > we can have an op-root of an add within another op-root of an add without > confusion. We might indicate on the inner op-root that they are not the root > of all locally added nodes, but just the root of an add operation. (Or have > scan_addition() find out by also scanning the parent of each add-op-root, > which it does anyway when asked to find the repository path of the add, > which it derives from the op-root's parent's BASE tree node ('s ancestors).) This would fix local adds, but it is not a complete solution for allowing all revert scenarios from nested add with history trees. (especially the cases where you replace some subtree of an add with history with a different tree) We need a more advanced schema to fix this category. The simple fix would fix this behavior we supported in 1.6, but we might want the better fix. Bert