[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: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 2 Sep 2009 16:37:26 +0100

On Wed, Sep 02, 2009 at 08:07:42AM -0700, Jonathan wrote:
> Is this still a known issue? We observed the same behavior in:
>
> svn, version 1.6.4 (r38063)
> compiled Aug 7 2009, 03:47:20
>
> Error message:
> svn: Attempt to add tree conflict that already exists
> svn: Error reading spooled REPORT request response

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.net/repos/svn/branches/1.6.x@39009 \
  http://svn.collab.net/repos/svn/branches/1.6.x-r38000 > double-tc.patch

Please report any issues which remain even with this fix in place.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2390275
Received on 2009-09-02 17:38:31 CEST

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