You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Hugo Mills <hu...@carfax.org.uk> on 2006/06/01 20:46:02 UTC
Re: 301 error on merging
Can anyone else help me with this problem, please? I've tried
reducing the configs to nothing but the VH with the svn repos in it,
and I've still got the same problem, so it looks like it's down to the
configs listed below and nothing else.
I'm getting to the point of hiding under my desk and crying with
this one.
Hugo.
On Wed, May 31, 2006 at 11:32:22AM +0100, Hugo Mills wrote:
> 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
--- Trouble rather the tiger in his lair than the sage amongst ---
his books for to you kingdoms and their armies are mighty
and enduring, but to him they are but toys of the moment
to be overturned by the flicking of a finger.
Re: 301 error on merging
Posted by Hugo Mills <hu...@carfax.org.uk>.
On Thu, Jun 01, 2006 at 09:46:02PM +0100, Hugo Mills wrote:
> Can anyone else help me with this problem, please? I've tried
> reducing the configs to nothing but the VH with the svn repos in it,
> and I've still got the same problem, so it looks like it's down to the
> configs listed below and nothing else.
For the record (and for anyone who finds this mail in an archive),
this appears to be solvable by renaming the WC directories to
something which doesn't appear in the repository path. After doing
that, I had no problem at all running the merge.
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
--- Ceci est un travail pour l'Australien. ---