问题
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.
回答1:
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.
回答2:
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.
回答3:
This is a post-commit related error.
Debug your post-commit script, generally inside your repository directory:
.../projectname/svn/hooks/post-commit
In the past I had a similar error message due to a syntax error in a post-commit email script
Flavio
回答4:
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.
回答5:
Try enabling Proxy Server in Tortoise, under Settings/Network option.
回答6:
I recently had this problem, and the solutions mentioned didn't solve it.
In my instance, I could commit individual files using Tortoise SVN, but all commits were failing using subclipse.
The issue was caused by my antivirus or firewall, Kaspersky. Pausing this resolved the issue.
Unfortunately, setting the svn clients as trusted does not solve the issue. I believe that this is a potential bug in the 2012 version of Kaspersky. (See here)
回答7:
you need to add directoty which generates error, to the subversion.
回答8:
I saw this article could help resolve this issue : http://cntrint.blogspot.com/2009/08/subversion-autodeploy-post-commit-hook.html
回答9:
Below steps works with me
- execute the program called 'TortoiseSVN Repository Browser' in your computer.
- It prompts the certificate was failed, and asks me to log in and restore the certificate
- After log in, everything was fine
来源：https://stackoverflow.com/questions/777623/subversion-commit-failed-merge-of-file-200-ok