Details
-
Bug
-
Status: Closed
-
Blocker
-
Resolution: Cannot Reproduce
-
all
-
None
Description
Hello One of our users is having some timeout problems when using svn on OS X. The client version is neon/0.23.9 SVN/0.22.2 (r5918), server version is also 0.22.2. Here is what the user has reported to us: I have been getting svn timeouts when executing commits on any of the three webapps, but not every time. So far, it has only been occurring with jsp files. This is the output: Transmitting file data ..........................svn: RA layer request failed svn: Commit failed (details follow): svn: MERGE request failed on '/svn/http-org.star-online/trunk/webapps/media' svn: MERGE of '/svn/http-org.star-online/trunk/webapps/media': timed out waiting for server (http://svn.cait.org) The changes are merged just fine on the server, however, executing status on my machine shows that the files still have a modified status. Doing an update solves this problem. We had him change the timeout in ~/.subversion/servers to 120: I just did a commit with 10 modified files and one addition. I still received a timeout/commit failed message. None of the files were large in size. If this helps here is the output: Sending de/index.jsp Sending de/nav_includes/de_lev0.jsp Sending de/nav_includes/de_lev1.jsp Sending de/nav_includes/de_lev1focus.jsp Sending de/nav_includes/de_lev2.jsp Adding de/nav_includes/mm_menu.js Sending de/nav_includes/vtlc_lev0.jsp Sending de/nav_includes/vtlc_lev1.jsp Sending de/nav_includes/vtlc_lev2.jsp Sending de/vtlc/login.jsp Sending de/vtlc/modules/setModParam.jsp Transmitting file data ...........svn: RA layer request failed svn: Commit failed (details follow): svn: MERGE request failed on '/svn/http-org.star-online/trunk/webapps/de' svn: MERGE of '/svn/http-org.star-online/trunk/webapps/de': timed out waiting for server (http://svn.cait.org) If any further information is needed let me know. Thanks Andy
Original issue reported by awettstein
Attachments
Issue Links
- is duplicated by
-
SVN-1430 MERGE timeouts - part 2
-
- Closed
-