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

> 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/
banana.xml
       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.

Thanks,

- Paul

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

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