[Subclipse-users] Commit failed when committing merge

Sometimes when I commit a very large merge (around 1000 changes) using Subclipse, 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 Subclipse 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 SVN 1.6.5 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/act/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 Subclipse closing the connection after a certain timeout period? I haven't seen it happen using the command line SVN client.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2430354

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-12-14 20:06:07 CET