merging problem when not trying to merge

Subversion 0.20.0, client on Win32 and server on Linux/Apache.

I have a simple repository that looks like this:

repos/test/file1
repos/test/file2
repos/example

I changed to /repos/example and did a "svn mkdir Contacts". I modified
file2, copied both file1 and file2 to repos/example/Contacts, then I
used TortoiseSVN to commit, adding the copies of file1 and file2.
TortoiseSVN uploaded everything, then told me there was some problem
merging. (I didn't look too closely at the message, because I thought I
could figure it out.) There wasn't anything to merge---just a new
directory, a couple of added files, and a modified file.

Thinking this was a TortoiseSVN bug, I went to the command line and did
"svn status":

A example/Contacts
A example/Contacts/file1
A example/Contacts/file2
M test/file2

Just what I expected. file1 and file2 had been added by TortoiseSVN as
expected, but they hadn't been properly committed. I tried "svn status -u":

        * 1 example
A * 0 example/Contacts
A * 0 example/Contacts/Bjorn Jensen.vcf
A * 0 example/Contacts/Meister Berger.vcf
M * 2 test/Meister Berger.vcf
Head revision: 3

So I tried "svn commit" from the command line:

Adding example/Contacts
svn: RA layer request failed
svn: Commit failed (details follow):
svn: MKCOL of
/repos/!svn/wrk/494f92bb-adc8-204a-aa69-5c4089cdee88/example/Contacts:
405 Method Not Allowed

That didn't look good. So I went to the server and did "svnadmin recover
repos". Then, back on the client, I tried "svn commit" again:

svn: RA layer request failed
svn: Commit failed (details follow):
svn: OPTIONS request failed on '/repos'
svn: OPTIONS of '/repos': 500 Internal Server Error

Any idea what is wrong? Did it have anything to do with using "svn
mkdir" in a non-repository-root directory?

Garret

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 28 21:28:13 2003