I'm getting an error when I try to merge a branch into a wc of trunk and
am confused about what it means and how to proceed.
Here's what I see:
$ svn merge -r741:HEAD $URL/branches/CaPSim-integration
svn: PROPFIND request failed on '/tor/group-etzioni/!svn/vcc/default'
svn: PROPFIND of '/tor/group-etzioni/!svn/vcc/default': 401
Authorization Required (https://hedgehog)
Some background:
Client and server both running on Linux at version 1.1.1. Repository is
only served via https. We are using mod_authz to manage access control.
I have rw access in the authz config file for the entire repository.
I am able to update and commit from the trunk wc. The cached auth
credentials seem to work:
$ svn update
At revision 768.
I've taken a peek at the the Apache access log and have attached the
relevant log below. It looks like it asks for authentication again
when it hits the tools dir, but I have no idea why.
+ seth
#-------8<-------- Apache access log -------------8<---------------------
140.107.170.101 - - [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 401 520
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 207 786
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 207 418
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/bln/768 HTTP/1.1" 207 473
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 207 786
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 207 418
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/bln/768 HTTP/1.1" 207 473
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 207 786
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 207 418
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/bln/768 HTTP/1.1" 207 473
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 207 786
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 207 473
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "REPORT /tor/group-etzioni/!svn/bc/768/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 200 278
140.107.170.101 - - [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 401 520
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration HTTP/1.1" 207 786
140.107.170.101 - - [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration/tools HTTP/1.1" 401 520
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "PROPFIND /tor/group-etzioni/cisnet/gauss-model/branches/CaPSim-integration/tools HTTP/1.1" 207 798
140.107.170.101 - - [18/Nov/2004:15:54:35 -0800] "PROPFIND /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 401 520
140.107.170.101 - sfalcon [18/Nov/2004:15:54:34 -0800] "REPORT /tor/group-etzioni/!svn/vcc/default HTTP/1.1" 200 45029
#-------8<-------- Apache access log --------------8<--------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 19 00:58:09 2004