[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 15:15:45 CEST

Stefan Küng wrote:
>
> I think our docs miss something: if the two urls are identical, then
> TSVN does a peg merge, which means you should do an
> 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
http://svn.myserver.com/testrepo/hello.txt@HEAD hello.txt
------
U hello.txt
------

C:\testrepo> svn revert hello.txt
Reverted 'hello.txt'

C:\testrepo> svn merge --force -r4:6
http://svn.myserver.com/testrepo/hello.txt@6 hello.txt
------
U hello.txt
------

C:\testrepo> svn revert hello.txt
Reverted 'hello.txt'

C:\testrepo> svn revert hello.txt
Reverted 'hello.txt'

C:\testrepo> svn merge --force -r4:6
http://svn.myserver.com/testrepo/hello.txt@4 hello.txt
------
U hello.txt
------

C:\testrepo> svn revert hello.txt
Reverted 'hello.txt'

C:\testrepo>

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.

Just to make sure, I tried a merge between 4 and 6 on hello.txt using
the URL http://svn.myserver.com/testrepo by right-clicking on hello.txt
in that same working copy and selecting "merge" from that menu. I got
the 301 Moved Permanently error for both a real merge and a dry-run. I
got no error when I tried, from that same dialog box, a unified diff.
Subclipse merge (both dryrun and the real thing) worked just fine.
Again, all on the same client box.

I'm not sure what significance there is in this, but my working copy
(C:\testrepo) and hello.txt both have a little red exclamation point on
them when I look at them in the Windows Explorer. Further, when I browse
the logs (using the show logs button on the merge dialog box), the
version 6 also has a little red exclamation point. Maybe that helps you
figure out what the problem is?

Also, I just noticed that I'm using svn v1.3.0 on my windows client, not
1.3.1.

Again, thanks for helping me out with this.

-Eric

>
> I think one of those command will throw the same error as TSVN does.
>
> 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
Received on Thu Apr 20 15:17:46 2006

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