[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Ancestrally Related Error Message

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Tue, 18 Jun 2013 10:57:28 -0500

On Tue, Jun 18, 2013 at 9:47 AM, Stefan Sperling <stsp_at_elego.de> 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 <stsp_at_elego.de> 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
Received on 2013-06-18 17:58:02 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.