On Mon, Sep 21, 2009 at 06:09:52AM -0700, Paul Hammant wrote:
>
> >Reading back, I'm not entirely sure what you were hinting at in
> >http://svn.haxx.se/users/archive-2009-09/0686.shtml
> >Success of 1.6.x-r38000, or failure?
>
> So I'm trying to say we are still experiencing a breaking merge that
> leaves us unable to progress...
>
> Here is an example of svn output that happens when svn exits part
> way though a merge. We are getting it on every branch we have tried,
> including a 1.6.x-r38000 on Friday:
>
> svn: Attempt to add tree conflict that already exists
> svn: Error reading spooled REPORT request response`
>
> We feel that users of svn should never see this abnormal-exit during
> a merge.
>
> Svn should just carry on in our opinion, and is not doing so. The
> worst that should happen, we believe, is marking of files as 'in
> merge conflict'.
>
> Will report back more today.z
Yes, users should never see this. If it happens, it's a bug in the
program. But the program needs to abort the merge because it's a
situation it is unlikely to recover from.
I've merged a fix for the missing '%s' in the "already exists" error
message into the branch. So you should now see which file is causing
the double tree conflict during the merge, with latest 1.6.x-r38000.
Thanks for catching this!
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2397503
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-21 17:32:43 CEST