[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 301 error on merging

From: Hugo Mills <hugo-svn_at_carfax.org.uk>
Date: 2006-05-31 12:32:22 CEST

On Wed, May 31, 2006 at 07:58:00AM +0100, o.nash@cs.ucc.ie wrote:
> check apache conf(s) for an Alias line pointing to one of your location
> blocks.
> that might be a possible cause.
> rgds
> oliver

   The only Alias lines (in any VH configuration) I have are pointing
/icons/ to /usr/share/apache2/icons/. I have ScriptAliases for various
/cgi-bin/ directories. In one VH, I use mod_rewrite to map all
requests to a single PHP script, but that's a completely separate VH
from the svn one.

   Hugo.

> On Tue, 30 May 2006, Hugo Mills wrote:
>
> > I'm getting a "301 Moved Permanently" error when trying to do a
> > merge on a small project. I've read the relevant entry in the FAQ on
> > the subject of 301s, and I believe that I don't have that particular
> > form of the problem.
> >
> > I am trying to merge two branches of my project, both with local
> > WCs:
> >
> > hrm@selene:video-process.semantic $ svn merge -r 812:823 ../video-process
> > svn: GET of '/private/!svn/bc/812/video-process/trunk': 301 Moved Permanently (http://svn.darksatanic.net)
> >
> > I can sucessfully check out any part of the repository as a new WC,
> > but not do a merge. I can even view the URI above in a browser.
> >
> > The relevant VirtualHost config in Apache reads:
> >
> > NameVirtualHost 10.2.0.18:80
> > <VirtualHost 10.2.0.18:80>
> > ServerName svn.darksatanic.net
> > ServerAdmin webmaster@darksatanic.net
> >
> > DocumentRoot /var/www/svn.darksatanic.net
> >
> > <Directory /var/www/svn.darksatanic.net>
> > Options -Indexes FollowSymLinks -MultiViews
> > AllowOverride None
> > Order allow,deny
> > allow from all
> > </Directory>
> >
> > include /etc/apache2/sites-available/svn-dav
> >
> > ErrorLog /var/log/apache2/error.svn.darksatanic.log
> >
> > # Possible values include: debug, info, notice, warn, error, crit,
> > # alert, emerg.
> > LogLevel warn
> >
> > CustomLog /var/log/apache2/access.svn.darksatanic.log combined
> > ServerSignature On
> >
> > UseCanonicalName off
> >
> > </VirtualHost>
> >
> > with the included svn-dav file being:
> >
> > <Location /svn>
> > DAV svn
> > SVNPath /usr/local/share/svn/main
> >
> > AuthType Digest
> > AuthName "Subversion"
> > AuthDigestFile /var/www/auth/svn.darksatanic.net
> > <LimitExcept GET PROPFIND OPTIONS REPORT>
> > Require valid-user
> > </LimitExcept>
> > </Location>
> >
> > <Location /private>
> > DAV svn
> > SVNPath /usr/local/share/svn/private
> >
> > AuthType Digest
> > AuthName "Subversion"
> > AuthDigestFile /var/www/auth/svn.darksatanic.net-private
> > Require valid-user
> > </Location>
> >
> >
> > The problematic repository is the /private one. The listing of the
> > ServerRoot directory is:
> >
> > hrm@varney:/var/www/svn.darksatanic.net$ ls -al
> > total 9
> > drwxr-xr-x 2 root www-data 112 2006-05-30 20:27 .
> > drwxrwxr-x 17 www-data www-data 680 2006-01-21 17:21 ..
> > -rw-r--r-- 1 root root 318 2005-02-25 15:41 favicon.ico
> > -rw-r--r-- 1 hrm www-data 657 2005-02-25 14:07 index.html
> >
> > I can't see anything which is clashing in the manner described by
> > the FAQ entry on this error message. Could someone tell me, please,
> > where it's going wrong.
> >
> > Hugo.
> >

-- 
=== Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
  PGP key: 1C335860 from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
   --- Well, you don't get to be a kernel hacker simply by looking ---   
                    good in Speedos. -- Rusty Russell                    

Received on Wed May 31 12:33:35 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.