[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: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 18 Jun 2013 19:22:06 +0200

On Tue, Jun 18, 2013 at 10:57:28AM -0500, Les Mikesell wrote:
> 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.

I don't think it would make a difference. I haven't tried to reproduce
the problem yet, though.

I believe that if the merged revision range includes additions, the merge
should work and add the files -- related ancestry or not. I don't know if
the additions were part of the revision range C M was merging.
Received on 2013-06-18 19:22:53 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.