> Van: Paul Hammant [mailto:paul_at_hammant.org]
>
> (svn 1.6.3 server and client)
>
> When we do a merge, we get 3/4 of the way through and encounter a
> tree
> conflict, that effectively halts it. Many hours work down the
> drain
> as there's no --resume feature.
>
> When trying to reproduce it, but more quickly, we're having some
> success exposing it with a "--accept theirs-full" merge (w/o
> specifying a diff3-cmd argument).
>
> It ends like so:
>
> --- Merging r1234 through r2345 into 'foo/Foo'
> G foo/Foo
> --- Merging r1234 through r2345 into 'foo/Bar'
> G foo/Bar
> svn: Attempt to add tree conflict that already exists
> svn: Error reading spooled REPORT request response
>
> Is the source file in error 'foo/Bar' or some unnamed file that
> follows it ?
>
> Attempts to reproduce in the child directories yield differing
> results:
>
> 1) cd into foo/ try the merge there (after refining the from-
> url)
> and it passes just fine as follows.
>
> svn merge --accept-theirs <url>/foo .
>
> Weird !!
>
> 2) cd into foo, but do the alleged file individually :
>
> svn merge --accept-theirs <url>/foo/Bar Bar
>
> This one barfs, like with the following in the command shell
> :
>
> svn: '/svn/rootfolder/!svn/bc/1666/trunk/foo/baz' path not
> found
>
> Weirder still huh ? Its not even the right file it is
> objecting to.
>
> Other data points are:
>
> 3) we can make further whitespace changes to Bar in trunk and
> the
> branch, and commit them just fine
>
> 4) there were no renames to the file in question either on
> trunk
> or branch.
>
> 5) we upgraded from Svn 1.5 to 1.6.3 a week ago.
>
> Thoughts?
I'm confused by your subject line. Is this about back-end fsfs DB corruption, or about weird tree conflicts causing your merge to fail (which I think has nothing to do with back-end corruption)?
Also, can you describe exactly what you did to reproduce it (i.e. what series of commands leads to the foo/Foo and foo/Bar etc, in which you get the error)?
Johan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2394360
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-13 23:41:41 CEST