Garret Wilson <garret@globalmentor.com> writes:
> 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.)
It said that the final http MERGE request failed, which is
webdav-speak for "the commit failed on the server". :-)
It has nothing to do with 'svn merge'. It's saying that it couldn't
merge your database transaction (containing your changes) into the
HEAD revision.
> 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
Hm, it looks to me like the commit *did* happen on the server, but
that your working copy wasn't processed afterwords. It still has
local changes scheduled for commit.
> 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
So of course trying to commit again won't work. The 'Contacts'
directory already exists.
Try checking out a fresh working copy.
---------------------------------------------------------------------
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:50:01 2003