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

Re: 301 Moved Perm error -- only with TSVN!

From: Eric Horne <subversion_at_box11.org>
Date: 2006-04-20 16:15:10 CEST

Stefan Küng wrote:
> On 4/20/06, Eric Horne <subversion@box11.org> wrote:
>>> svn merge --force [--ignore-ancestry] -r4:6 url@HEAD workingcopy
>>> also try
>>> svn merge --force [--ignore-ancestry] -r4:6 url@6 workingcopy
>>> svn merge --force [--ignore-ancestry] -r4:6 url@4 workingcopy
>> Ok, here are the results:
>> C:\testrepo> svn merge --force -r4:6
>> C:\testrepo> svn merge --force -r4:6
>> C:\testrepo> svn merge --force -r4:6
> Did you try the --ignore-ancestry option too?

No, but I just did now and it seems to have been successful from the
command line.

>> In all cases, the hello.txt file was updated correctly with the changed
>> made on the trunk between version 4 and 6. I also tried specifying the
>> workingcopy as "." and as "C:\testrepo\hello.txt" -- I got similar results.
> this turns out to be very difficult to debug. Can you maybe give me
> access to your server somehow? So I can try the merge myself from my
> home computer?

I can give you access via http... try http://svn.box11.org/testrepo.
I've gotta go to work now, so I may not be able to respond until tonight.



To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Apr 20 16:16:02 2006

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