Commit failed when committing merge

Sometimes when I commit a very large merge (around 1000 changes), I get the following error:

    Transmitting file data ...
    RA layer request failed
svn: Commit failed (details follow):
svn: MERGE of '/path/to/trunk': timed out waiting for server (https://svnserver)

The thing is, the commit actually succeeded; I can see the new version using svn log.

But it seems like my working copy wasn't informed of the successful commit. So it thinks it's at the previous version. If I try to update, it will see all the changes from the merge as conflicts. As a result, the working copy is completely useless, and must be deleted.

Looking in the Apache logs for my server, I see this (it appears a few minutes after I get the error):

[Mon Dec 14 13:23:19 2009] [error] [client 1.2.3.4] Could not MERGE resource "/repos/!svn/ac​t/fa1bb793-cd6f-1c4a​-84a
f-4ffdd268ac25" into "/path/to/trunk". [500, #0]
[Mon Dec 14 13:23:19 2009] [error] [client 1.2.3.4] Error constructing resource list. [500, #104]
[Mon Dec 14 13:23:19 2009] [error] [client 1.2.3.4] Can't write response to output: Connection reset by peer [500
, #104]

Any idea what could cause this? Is Subversion closing the connection after a certain timeout period?

My client is Subclipse 1.6.5, using SVNKit 1.3.1. The Subclipse people didn't think it was a Subclipse bug, although it could be a problem with SVNKit. The server is Subversion 1.6.5 using Apache.

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

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-14 20:31:24 CET