Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 05387F98F for ; Sat, 24 Aug 2013 19:53:48 +0000 (UTC) Received: (qmail 17824 invoked by uid 500); 24 Aug 2013 19:53:47 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 17804 invoked by uid 500); 24 Aug 2013 19:53:47 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 17792 invoked by uid 99); 24 Aug 2013 19:53:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Aug 2013 19:53:47 +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: local policy) Received: from [192.109.42.8] (HELO einhorn.in-berlin.de) (192.109.42.8) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Aug 2013 19:53:41 +0000 X-Envelope-From: stsp@stsp.name Received: from ted.stsp.name (ted.stsp.name [217.197.84.34]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id r7OJrFNX003473 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 24 Aug 2013 21:53:15 +0200 Received: from ted.stsp.name (localhost [127.0.0.1]) by ted.stsp.name (8.14.7/8.14.3) with ESMTP id r7OJrFUJ019076; Sat, 24 Aug 2013 21:53:15 +0200 (CEST) Received: (from stsp@localhost) by ted.stsp.name (8.14.7/8.14.7/Submit) id r7OJrEBC006641; Sat, 24 Aug 2013 21:53:14 +0200 (CEST) Date: Sat, 24 Aug 2013 21:53:14 +0200 From: Stefan Sperling To: Travis Brown Cc: Les Mikesell , Ryan Schmidt , Branko =?utf-8?B?xIxpYmVq?= , Subversion , dev@subversion.apache.org Subject: Re: Switching Message-ID: <20130824195313.GC8910@ted.stsp.name> Mail-Followup-To: Travis Brown , Les Mikesell , Ryan Schmidt , Branko =?utf-8?B?xIxpYmVq?= , Subversion , dev@subversion.apache.org References: <81E45292CF3BC5478E88DF55E216AD2F03B46E5E@FLONIDANPOST.flonidan.net> <52178B18.9050007@gmx.us> <5217A562.3020202@gmx.us> <54C87FD8-9CBD-41A3-9D6B-F7C1C787BB60@ryandesign.com> <5218656B.6020302@wandisco.com> <9DEB2347-7103-49A2-AC8C-51C8223C3069@ryandesign.com> <20130824190447.GB8910@ted.stsp.name> <20130824192641.GA5617@daredevil.travisbrown.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130824192641.GA5617@daredevil.travisbrown.ca> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 X-Virus-Checked: Checked by ClamAV on apache.org On Sat, Aug 24, 2013 at 12:26:41PM -0700, Travis Brown wrote: > That's just overcomplicating the issue. This doesn't even need to > become a tree conflict. In my opinion it does need to be flagged as a conflict. Because we don't know what the contents of the incoming directory will be nor what the user may eventually want to do to resolve the problem. Making the unversioned directory versioned is just one possible options among several. See Branko's post: http://svn.haxx.se/users/archive-2013-08/0478.shtml