Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5AABA9F04 for ; Tue, 6 Mar 2012 11:53:35 +0000 (UTC) Received: (qmail 58585 invoked by uid 500); 6 Mar 2012 11:53:35 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 58562 invoked by uid 500); 6 Mar 2012 11:53:35 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 58555 invoked by uid 99); 6 Mar 2012 11:53:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 11:53:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.131] (HELO eos.apache.org) (140.211.11.131) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 11:53:33 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id E97661C5 for ; Tue, 6 Mar 2012 11:53:12 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache subversion Wiki To: Apache subversion Wiki Date: Tue, 06 Mar 2012 11:53:12 -0000 Message-ID: <20120306115312.70578.83704@eos.apache.org> Subject: =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22MultiLayerMoves=22_by_Philip?= =?utf-8?q?Martin?= Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" fo= r change notification. The "MultiLayerMoves" page has been changed by PhilipMartin: http://wiki.apache.org/subversion/MultiLayerMoves?action=3Ddiff&rev1=3D16&r= ev2=3D17 = There is only one move recorded C/F->C/G. The move inside the copy is re= corded in a similar way to the move inside a move. = + =3D Move rewrites moved-to =3D + = + Move has to rewrite moved-to both inside an outside the moved tree. The f= irst case is moved-to entirely within the moved tree: move A to B after A/F= to A/G. This causes moved-to on A/F to be rewritted (to null) and moved-t= o on B/F to be added: + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || A/F || normal || || + || 2 || A/F || base-deleted || A/G || + || 2 || A/G || normal || || + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || A/F || normal || || + || 1 || A || base-deleted || B || + || 1 || A/F || base-deleted || || + || 1 || B || normal || || + || 1 || B/F || normal || || + || 2 || B/F || base-deleted || B/G || + || 2 || B/G || normal || || + = + The second case is moved-to from inside the moved-tree to outside the mov= ed tree: move A to B after A/F to G. Like the first case this requires the = moved-to on A/F to be rewritten (to null) and moved-to on B/F to be added. = Compared to the first case the value of the rewritten moved-to doesn't chan= ge: + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || A/F || normal || || + || 2 || A/F || base-deleted || G || + || 1 || G || normal || || + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || A/F || normal || || + || 1 || A || base-deleted || B || + || 1 || A/F || base-deleted || || + || 1 || B || normal || || + || 1 || B/F || normal || || + || 2 || B/F || base-deleted || G || + || 1 || G || normal || || + = + The third case is move-to from outside the moved tree into the moved tree= : move A to B after F to A/F. This causes moved-to on F, outside the moved = tree, to be rewritten: + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || F || normal || || + || 1 || F || base-deleted || A/G || + || 2 || A/G || normal || || + = + || op-depth || local-relpath || presence || moved-to || + || 0 || A || normal || || + || 0 || F || normal || || + || 1 || A || base-deleted || B || + || 1 || F || base-deleted || B/G || + || 1 || B || normal || || + || 2 || B/G || normal || || +=20