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, I get no such error.
Furthermore, I am able to checkout, produce logs, produce a diff (via
the merge dialog!), create branches, commit, basically do all sorts of
stuff. 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.
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
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...
Thanks for your help.
-Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 19 07:34:58 2006