Austin I don't know if this is the issue but I get this error (svn
0.33.0) if I try and do a merge on a directory that contains a file of
the same name and the merge is being run from within the directory.
For example if I have a directory named trunk/projA which contains the
files projA.c and projA (source and exe) all of which are under svn. If
I try want to merge branches/projA then 'svn merge -r 4:10
$URL/branches/projA' will fail from within the projA directory. Even if
the WC is specified as '.' it will fail. The solution I found is to
either run it from the parent directory or use ../projA as the WC.
This problem confused me for quite awhile because 'svn diff' does not
behave this way.
Hope this helps.
Ross
Austin Bingham wrote:
>I've looked through the mail archives, and I can't find any definitive
>answers to issue. I'm in the process of merging some changes from a branch
>back into the trunk. I initially merged one project over, and that process
>went fine. However, the merge of the second project always results in the
>following error:
>
> svn: RA layer request failed
> svn: GET of /svn/!svn/bc/4058/branches/abingham/project_name: 301 Moved Permanently (http://hostname)
>
>The apache error log says the following:
>
> [Thu Dec 11 07:23:08 2003] [error] [client 10.9.16.89] Could not fetch resource information. [301, #0]
> [Thu Dec 11 07:23:08 2003] [error] [client 10.9.16.89] (2)No such file or directory: Requests for a collection must have a trailing slash on the URI. [301, #0]
>
>Indeed, the GET command I see in the access log shows no trailing / on the
>collection. However, this is also the case with the merge that worked.
>
>So, I'm wondering if anyone has any ideas. This is on a linux system,
>using apache 2.0.48, and subversion 0.34.0 (although the problem
>existed on prior versions). The pertinent parts of my httpd.conf look like
>this:
>
> <Location /svn>
> DAV svn
> SVNPath /svn
> Allow from all
> </Location>
>
>At no time has the web interface not worked, so I'm assuming I have that
>configuration at least mostly correct.
>
>Thanks in advance for any help on this.
>
>Austin Bingham
>abingham@spamcop.net
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 12 01:55:31 2003