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 04AAC107AD for ; Tue, 18 Jun 2013 15:57:56 +0000 (UTC) Received: (qmail 40018 invoked by uid 500); 18 Jun 2013 15:57:55 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 39797 invoked by uid 500); 18 Jun 2013 15:57:54 -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 39790 invoked by uid 99); 18 Jun 2013 15:57:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jun 2013 15:57:54 +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: domain of lesmikesell@gmail.com designates 209.85.128.182 as permitted sender) Received: from [209.85.128.182] (HELO mail-ve0-f182.google.com) (209.85.128.182) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jun 2013 15:57:49 +0000 Received: by mail-ve0-f182.google.com with SMTP id ox1so3272629veb.27 for ; Tue, 18 Jun 2013 08:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=flNseqvcbJgP58QNyzg9+UW2pUuELVib/LwxZ2cIdhA=; b=bsLA4k/fOr4u9foDyE2iUXMKVMJu9SlAyTp23UYFfV/w/c42gwj6VkI2yzpq5UViEH gHzIQu+FS5oLG0L6Xgl1GSmVK2puW8M3kjvhoooryDttmwyP5HL9eNbD+Sq0uzCD3MT4 ZGK9P556YQYrI9XRxqVGs7xLLFl44JXboltRDgoQVEa6aZeRLpXBsn0YamnDvkik2ABs +p9/W5UiA4m+BcU9nQrhWf7kK8IBO4Qh3QCysO9wgwQlNTdFQF/2ZulQSfdLwWAPV8aF +Houhyqa6lD8nNW5R4dgop4w+mGf5KzRPZgfE9eFCxtCH9Ws14LXBvp5iCILmDQGvJKA uMPA== MIME-Version: 1.0 X-Received: by 10.58.219.232 with SMTP id pr8mr5514064vec.80.1371571048997; Tue, 18 Jun 2013 08:57:28 -0700 (PDT) Received: by 10.58.15.138 with HTTP; Tue, 18 Jun 2013 08:57:28 -0700 (PDT) In-Reply-To: <20130618144730.GG23326@jack.stsp.name> References: <51BF2D68.2090100@collab.net> <1B05D8F50421E24799AE93B03CC284BE01C5AFF08A@CRPMBX01.corp.cbeyond.net> <20130618093125.GA23326@jack.stsp.name> <20130618144730.GG23326@jack.stsp.name> Date: Tue, 18 Jun 2013 10:57:28 -0500 Message-ID: Subject: Re: Ancestrally Related Error Message From: Les Mikesell To: Les Mikesell , C M , Andrew Reedick , "C. Michael Pilato" , Subversion Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org On Tue, Jun 18, 2013 at 9:47 AM, Stefan Sperling wrote: > On Tue, Jun 18, 2013 at 09:33:25AM -0500, Les Mikesell wrote: >> On Tue, Jun 18, 2013 at 4:31 AM, Stefan Sperling wrote: >> >> > In your case, the latter isn't true. You have a new directory /trunk, >> > which is empty, and you are trying to merge changes into it. >> >> Is there any advantage in merging changes to an empty path as compared >> to just copying to it? > > No, the net effect should be the same. But merging the adds and > subsequent modifications should actually work. Would it have made a difference in the subversion processing if the empty trunk had been copied to create the branch before the initial import? That is, would having a common ancestor as the parent directory have made the 'adds' merge correctly? It is probably rare to create a branch that is unrelated to anything else. -- Les Mikesell lesmikesell@gmail.com