From users-return-1076-daniel=haxx.se@subversion.apache.org Thu Feb 18 12:16:01 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 o1IBG0dn006263 for ; Thu, 18 Feb 2010 12:16:01 +0100 Received: (qmail 11172 invoked by uid 500); 18 Feb 2010 11:15:55 -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 11164 invoked by uid 99); 18 Feb 2010 11:15:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 11:15:55 +0000 X-ASF-Spam-Status: No, hits=-1.0 required=10.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; Thu, 18 Feb 2010 11:15:44 +0000 X-Envelope-From: stsp@stsp.name Received: from jack.stsp.name (jack.stsp.name [217.197.84.187]) (authenticated bits=128) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id o1IBFFrJ024606 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 18 Feb 2010 12:15:16 +0100 Received: from jack.stsp.name (stsp@localhost [127.0.0.1]) by jack.stsp.name (8.14.3/8.14.3) with ESMTP id o1IBFFph005800; Thu, 18 Feb 2010 12:15:15 +0100 (CET) Received: (from stsp@localhost) by jack.stsp.name (8.14.3/8.14.3/Submit) id o1IBFEUu015799; Thu, 18 Feb 2010 12:15:14 +0100 (CET) Date: Thu, 18 Feb 2010 12:15:14 +0100 From: Stefan Sperling To: Kenneth Porter Cc: Subversion Users Subject: Re: Reorganizing a live tree Message-ID: <20100218111514.GE29684@jack.stsp.name> References: <1116F2FE06E01C3E369753B4@[10.0.0.199]> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1116F2FE06E01C3E369753B4@[10.0.0.199]> User-Agent: Mutt/1.5.20 (2009-06-14) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 On Thu, Feb 18, 2010 at 02:49:35AM -0800, Kenneth Porter wrote: > If I move a file (say, to a new subdirectory) and commit, and > another user then edits the file from a pre-move WC, what happens > when he updates his WC? Do his edits get merged to the file in the > new location? See http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html Stefan