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

Re: Re: multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response

From: Thomas Peter <usenet_at_braindumped.com>
Date: Mon, 07 Sep 2009 09:05:23 +0000

Hi,

I hope the reply makes it to the thread. Since I'm not subscribed and
haven't found any way (e.g. gmane) to reply to an old post...

On 2009-09-02 08:37:34 PDT, Stefan Sperling wrote:
> A fix for this is pending for 1.6.6.
>
> If you need it now, you can get the patch like this:
>
> svn diff http://svn.collab.ne?t/repos/svn/branches?/1.6.x@39009 \
> http://svn.collab.ne?t/repos/svn/branches?/1.6.x-r38000 > double-tc.patch
>
> Please report any issues which remain even with this fix in place.

I just patched the 1.6.5 sources (official tarball):

svn, version 1.6.5 (r38866)
   compiled Sep 7 2009, 10:26:27

and got the same error:
svn: Attempt to add tree conflict that already exists
svn: Error reading spooled REPORT request response

This occures when I want to merge two branches (that hasn't been
branched from the same ancestor).

Thanks in advance
Thomas

PS: please CC: me as I'm not subscribed to the list - thnx

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391774
Received on 2009-09-07 11:19:16 CEST

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