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

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?

> 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?

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org