我设置了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),一切都运行正常。
如果您需要更多信息,请与我们联系。