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

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

From: Paul Hammant <paul_at_hammant.org>
Date: Wed, 16 Sep 2009 09:52:15 -0500

> What we've learned though is that there are tree conflicts all over
> the place. Thus, we're going to try some other strategy & report
> back.

As suggested earlier, svn-1.6.x-latest is better at communicating
which file is the actual tree conflict. Like so

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

When trying to 'resolved' that one, and optimistically resume the
merge, we're discovering that svn had made multiple items marked as
"! C", not just the first one.

Could svn be changed to report all of the items that are tree
conflicts, not just the first one (or not just a single one) ?

I appreciate that resuming a merge is somewhat non-standard too, but
we have no choice here if we're trying to get past this issue.

What we'd really love is the ability to respond via std-in with a "P"
for pend, in respect of tree conflicts, and deal with them after the
merge invocation.


- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 16:53:50 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.