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 E08D3E4BD for ; Wed, 16 Jan 2013 18:28:05 +0000 (UTC) Received: (qmail 85298 invoked by uid 500); 16 Jan 2013 18:28:05 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 85242 invoked by uid 500); 16 Jan 2013 18:28:05 -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 85235 invoked by uid 99); 16 Jan 2013 18:28:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 18:28:05 +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; Wed, 16 Jan 2013 18:28:03 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id 09B948F for ; Wed, 16 Jan 2013 18:27:42 +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: Wed, 16 Jan 2013 18:27:42 -0000 Message-ID: <20130116182742.181.21121@eos.apache.org> Subject: =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22LocalMoves=22_by_JulianFoad?= 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 "LocalMoves" page has been changed by JulianFoad: http://wiki.apache.org/subversion/LocalMoves?action=3Ddiff&rev1=3D7&rev2=3D8 = Well, not yet a design but just a collection of notes. = + ---- + /!\ '''Edit conflict - other version:''' + = + ---- + = + ---- + /!\ '''Edit conflict - your version:''' + = + ---- + =3D=3D To Break or Not To Break? =3D=3D + One of the main UI (and high-level API) changes is that many operations o= n the path representing one half the move should be aware of the other half= and perhaps require that both halves are acted on together: for example, a= n attempt to commit one half of a move without the other should error out. = Brief thoughts: + = + commit should require both together + = + delete should change the 'from' path to deleted + = + revert should require both together (and require recursive if either half= has children) + = + ... + = + ---- + /!\ '''End of edit conflict''' + = + ---- =3D=3D=3D svn status =3D=3D=3D Currently shows 'D' for every node in the moved-away tree, but 'A+' only = for the root of the moved-here. A minimum change is: show just 'D' for onl= y the root node of the moved-away subtree (and still one 'A+' for the moved= -here). = @@ -23, +47 @@ Should it require 'force' for that? = =3D=3D=3D svn resolve (resolver) =3D=3D=3D - = Using theirs-commit currently resolves a conflict from a local move by no= t pulling in their changes. theirs-commit should probably be removed as an= option since it doesn't make any sense in this context. =20