[root_at_crossbow /home/vitaliy]# svn info toolbox/vitaliy/
Path: toolbox/vitaliy
URL: http://crossbow:81/toolbox/branches/vitaliy
Repository Root: http://crossbow:81/toolbox
Repository UUID: d94297c4-f450-11dc-87ca-b2500d36a6e7
Revision: 20662
Node Kind: directory
Schedule: normal
Last Changed Author: vitaliy
Last Changed Rev: 20647
Last Changed Date: 2009-07-10 16:59:54 -0400 (Fri, 10 Jul 2009)
merging into the given URL from http://crossbow:81/toolbox/trunk
Apache config:
<VirtualHost 10.2.8.10:81>
ServerName crossbow
<Location />
DAV svn
SVNParentPath /usr/local/subversion
AllowOverride All
# how to authenticate a user
AuthType Basic
AuthName "Subversion Repository"
AuthUserFile /var/www/.sub_passwd
AuthzSVNAccessFile /var/www/authz
Require valid-user
</Location>
I've just discovered that another repository is acting the same way.
This gives me 2 repositories that are acting up during the merge.
Something has to do with trailing slash (since difference inside the
error is within the trailing slash of the URI)
-----Original Message-----
From: Stefan Sperling [mailto:stsp_at_elego.de]
Sent: Monday, July 13, 2009 12:41 PM
To: Sholokhov, Vitaliy
Cc: users_at_subversion.tigris.org
Subject: Re: Upgrading from 1.4 to 1.6.3
On Mon, Jul 13, 2009 at 12:24:10PM -0400, Vitaliy Sholokhov wrote:
> 'svn checkout' does not yield any problems. I can
> checkout/update/commit to repository (trunk or a developer branch)
> just fine... Merging, however, via http from trunk to a branch is
> giving problems described below.
> However, this is isolated to this single repository, since me and
> other developers were able to merge other repositories without running
> in into this kind of error response.
> Now I'm wondering how this can be fixed without loosing any revision
> history...
I have no idea, frankly :(
I guess it must be something wonky with the apache config.
I don't think mod_dav_svn itself would ever send a 301 response.
What's the URL of the working copy you are merging into?
svn info should tell you. What does Apache do with this URL?
Stefan
******************************************************************************
Nothing contained in this e-mail shall (a) be considered a legally binding agreement, amendment or modification of any agreement with Marvel, each of which requires a fully executed agreement to be received by Marvel or (b) be deemed approval of any product, packaging, advertising or promotion material, which may only come from Marvel's Legal Department.
******************************************************************************
THINK GREEN - SAVE PAPER - THINK BEFORE YOU PRINT!
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371007
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-13 19:21:31 CEST