On Jun 12, 2008, at 02:40, Rick Oosterholt wrote:
> Here's the information you requested:
>
> merge command option: svn merge -r18479:18267 http://SERVER/svn/
> branches/Version4-1-5 JavaFile.java
Ok, I can reproduce the problem now. If you want to merge just a
single file, then you need to include the filename in the URL.
svn merge -r18479:18267 http://SERVER/svn/branches/Version4-1-5/
JavaFile.java JavaFile.java
> TortoiseSVN merge for JavaFile.java: from http://SERVER/svn/
> branches/Version4-1-5 revision 18267 to http://SERVER/svn/branches/
> Version4-1-5 HEAD
> Netbeans merge for JavaFile.java: from One Repository Folder Since
> Its Origin, branche: branches/Version4-1-5
>
> All give same error as reposted in original message (error #301)
>
> Thanks again,
> Rick
>
> Ryan Schmidt schreef:
>> On Jun 12, 2008, at 01:46, Rick Oosterholt wrote:
>>
>>> Ryan Schmidt schreef:
>>>
>>>> On Jun 11, 2008, at 10:08, Rick Oosterholt wrote:
>>>>
>>>>> When I try to merge a single file from one branch to another, I
>>>>> get the following error:
>>>>> GET of '/XYZ/!svn/bc/18479/branches/FortesIPM4-1-5': 301 Moved
>>>>> Permanently (http://SERVER)
>>>>> Apache error log says:
>>>>> Could not fetch resource information. [301, #0]
>>>>> Requests for a collection must have a trailing slash on the
>>>>> URI. [301, #0]
>>>>>
>>>>> I've read the FAQ part: http://subversion.tigris.org/
>>>>> faq.html#http-301-error but this didn't help.
>>>>
>>>> Could you show us the actual merge command you issued?
>>>>
>>>> What OS and what version of Subversion are running on the server
>>>> and on the client? What version of Apache on the server?
>>>
>>> Hi,
>>>
>>> Thanks for the quick answer!
>>>
>>> Here is the information you asked:
>>> merge command: not quite sure. I'm not using the command line,
>>> but I've tried merging in Netbeans and with TortoiseSVN...
>>> OS: Windows XP Pro (5.1.2600 Service Pack 3 Build 2600)
>>> Subversion installer (client and server): Subversion for Win32,
>>> version 1.4.6
>>> Apache: Win32 , version 2.2.8
>>
>> It would be helpful if you could retry your merge on the command
>> line, since many of us don't use TortoiseSVN. Or tell us what
>> parameters you fill into which boxes of TortoiseSVN's merge dialog.
>>
>> Also, it may help to see the way you have Subversion set up in the
>> Apache configuration.
>>
>> Don't forget to Reply All so your message goes to the list too,
>> not just to me.
>>
>> <r_oosterholt.vcf>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-12 09:54:17 CEST