我被要求在这里发表(原文在这里 )
我设置SVN和Apache,当我做一个checkout它正常执行,但每当我尝试运行svn merge由于某种原因,它只是挂起。
以下是我的Apache访问日志的输出:
==> httpd-access.log <== [IP_ADDRESS] - - [30/Mar/2015:10:46:47 -0400] "OPTIONS [BRANCH_PATH] HTTP/1.1" 401 381 [IP_ADDRESS] - [AUTH_USER] [30/Mar/2015:10:46:47 -0400] "OPTIONS [BRANCH_PATH] HTTP/1.1" 200 179 [IP_ADDRESS] - [AUTH_USER] [30/Mar/2015:10:46:47 -0400] "OPTIONS [BRANCH_PATH] HTTP/1.1" 200 179 [IP_ADDRESS] - [AUTH_USER] [30/Mar/2015:10:46:47 -0400] "REPORT /!svn/rvr/[REV_ID]/[BRANCH_PATH] HTTP/1.1" 200 381 [IP_ADDRESS] - - [30/Mar/2015:10:46:49 -0400] "OPTIONS [TRUNK_PATH] HTTP/1.1" 401 381 [IP_ADDRESS] - [AUTH_USER] [30/Mar/2015:10:46:49 -0400] "OPTIONS [TRUNK_PATH] HTTP/1.1" 200 179
我在另一台Debian Linux服务器上也有类似的设置(SVN + Apache),一切正常。
让我知道如果你需要更多的信息。