Eric Horne wrote:
> I'm running Fedora Core 5/ SVN 1.3.1 for a server. TortoiseSVN 1.3.3
> from a windows XP Media Center 2005 client. I'm hoping someone can point
> me in the right direction here.
>
> Using TortoiseSVN, if I try to execute a merge of changes made to the
> trunk into a branch I have, I get an "301 Moved Permanently" error from
> the server. If I do what I think is exactly the same command from my
> command-line SVN client or even Subclipse, I get no such error.
You don't tell here if it works if you try the SVN client or Subclipse
on *windows* or on your linux box. If on linux, then please try the SVN
client on windows too.
There's also a FAQ entry about 301 errors:
https://subversion.tigris.org/faq.html#http-301-error
but judging from your posts to the subversion users list I assume you've
already checked that one.
> Furthermore, I am able to checkout, produce logs, produce a diff (via
> the merge dialog!), create branches, commit, basically do all sorts of
> stuff with TSVN. Occasionally (I haven't figured out what conditions) I
> have a problem producing a revision graph (it reports no graph
> available). Never can I merge.
The revision graph in 1.3.x only shows copies, no 'normal' commits. And
it has a bug too which sometimes doesn't even show copies. It's fixed in
trunk.
> Example: I create a brand new repository on the linux box, correct
> permissions and all. Create a "trunk", a "branches" , and a
> "branches/b1". I create and commit hello.txt into "trunk" (creating rev
> 4). I branch it to branches/b1. I change the trunk/hello.txt to create a
> rev 6. I do all this through tortoiseSVN successfully. Now i go to apply
> the changes between rev 4 and rev 6 to my current working copy
> (branches/b1/hello.txt). Executing a dry-run yields a 301 error. If I do
> the following command from the same client, it is successful (in the
> working directory)
>
> svn merge -r 4:6 http://svn.myserver.com/testrepo/trunk/hello.txt
According to our docs:
http://tortoisesvn.sourceforge.net/docs/nightly/TortoiseSVN_en/tsvn-cli-main.html#tsvn-cli-merge
you should try
svn merge --force [--dry-run]
http://svn.myserver.com/testrepo/trunk/hello.txt@4
http://svn.myserver.com/testrepo/trunk/hello.txt@6
And please do that on the same windows box you use TSVN on. Otherwise
the test isn't really accurate.
> Does anyone know what I could possibly be doing wrong? I have apache
> 2.2.x setup on the linux box, it is hosting svn dav. I have no
> authentication setup, and I am using a virtual host. I have DocumentRoot
> set for the virtual host to point to some place far away and empty
> (/var/tmp/myemptydir). The rest is pretty standard out-of-the-box
> subversion.conf.
>
> Can anyone help me? It appears to be a TortoiseSVN problem, but I'm
> still learning SVN, so maybe I munged something up...
I somehow doubt that it's a TSVN problem, because TSVN uses the
Subversion library to do the merge. So you should get the same errors
with the SVN client on windows as you do with TSVN.
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 Wed Apr 19 17:29:53 2006