tags:

views:

3040

answers:

4

Hello,

I am having the strangest problem ... every time i commit i get and error like this:

commit failed (details follow): MERGE of '/svn/project/trunk/web/directory/': 200 OK (http://mydomain.com)

that is the directory of the file i modified.

Later Edit i have web dav SVN installed and i commit to a HTTP URL. and there is a post commit hook doing a svn update on a directory on the same machine

Any ideas ? thank you for your help.

+9  A: 

You'll get that error if your post-commit is failing. Try running it from the command line with the same args to make sure it works properly. I had this error a week or two ago when my python script was erroring out.

jvenema
Got the same problem and it was indeed post-commit failing. Why this message is so cryptic??
gruszczy
+2  A: 

I found this and this on Google... Might be helpful?

Looks like it's tied to the post-commit failing. However, it's probably actually committed.

Andrew Flanagan
A: 

I'm getting the same error.

The commit is indeed going through. If I manually update a checked out working copy it does in fact reflect the file I just added.

If I run the post-commit script manually, it runs fine - update happens, outputs the results.

So the problem is not with the post-commit script.

Any ideas as to what might actually be causing the problem?

Thanks

1337ingDisorder
Walty
+1  A: 

I've encountered the same problem when I had made many changes and prepared to commit to CodePlex. I've tried do it on command line, but failed too. I have to revert my project and split my changes to some smaller ones and commit one by one. Then it's OK.

But I doesn't know WHY.

Cook Schelling