subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Les Mikesell <lesmikes...@gmail.com>
Subject Re: Ancestrally Related Error Message
Date Tue, 18 Jun 2013 15:57:28 GMT
On Tue, Jun 18, 2013 at 9:47 AM, Stefan Sperling <stsp@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@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
     lesmikesell@gmail.com

Mime
View raw message