Re: Hard-to-understand error message after merge

Daniel Widenfalk <Daniel.Widenfalk_at_iar.se> writes:

> One of my colleagues got a hard-to-decipher error message after
> trying to do a merge (trunk -> branch):
>
> svn: E200007: Can't add '{some-path}\svntest\C\B' with URL
> '{repo-path}/svn-test/A/B', but with the data from
> '{repo-path}/tools/trunk/makecd'
> svn: E175002: Error reading spooled REPORT request response
>
> After about an hour of head scratching we figured out that something
> like the following had occurred:

Thank's for working out the steps!

> I *think* the problem here is that we're both moving the external
> B -> B\D and in the same commit also add B. When we then try to
> do the merge we first merge the file updates and this detects that
> B is already present and under svn controll even though we're
> also moving B -> B\D through updating the externals directive.
>
> I would count this as "user error" rather than an "svn error" but
> it feels weird that I can create a revision that cannot be merged
> without first doing a svn delete (B) in the destination tree.
>
> Thoughts?

I've raised issue 4360:

http://subversion.tigris.org/issues/show_bug.cgi?id=4360

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download