Re: annoying "Attempt to add tree conflict that already exists"

> Paul, can you provide a script which reproduces the problem for
> you with 1.6.5 + patch, starting from an empty repository and
> leading up to the point where the double-tc error is produced?
> That would really, really, help! If it turns out that our fix is
> incomplete, we may have to revise it again. The earlier we can
> reproduce the failure the higher the chances of a proper fix ending
> up in 1.6.6.
>

Maybe. We've made progress. Whereas we previously though foo/Bar was
the 'area' where merge conflicts were happening:

      G foo/Bar
       svn: Attempt to add tree conflict that already exists
       svn: Error reading spooled REPORT request response

We see that 1.6.x_at_39362 is reporting more information - YAY !

      G foo/Bar
       svn: Attempt to add tree conflict that already exists at apple/
banana.xml
       svn: Error reading spooled REPORT request response

Great work folks, we might be able to make progress. Will report back
later.

- Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395579

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 16:25:27 CEST