After upgrading my Subversion server to Ubuntu Feisty, I noticed that when committing I got the following error:
svn: MERGE request failed on '/svn/repository/trunk' svn: MERGE of '/svn/repository/trunk': 200 OK (http://svn.myserver.com)
Although the messages says that the commit failed, it has not. A simple ’svn update’ will merge the changes you made to the repository to your working copy again and you’re good to go.
So, what is the problem here? Are you by any chance running Trac? Did you install the post-commit hook to integrate Subversion with Trac? Right, so did I.
The problem here is that the trac-post-commit-hook script needs a few updates in order to include the proper modules. Take a look at the most recent 0.10.x version.
After updating the trac-post-commit-hook script, commits worked fine again. Such an easy fix for such a nasty problem.
4 Comments
Thanks dude. I had the same error and I had no clue on how to fix it.
Thanks again
Thanks for posting this, as it helped us pinpoint our related problem. To help people with their detective work on similar issues:
svn: MERGE request failed on ‘/svn/repository/trunk’
svn: MERGE of ‘/svn/repository/trunk’: 200 OK (http://svn.myserver.com)
Notice the second line: 200 OK. That means that the actual commit went through ok, which led us to believe our issue had to do with our post-commit hook. We are not using trac’s post-commit hooks, but instead our own, which had an issue with wget. So if you get that error, I would suggest you run svnserve and try to checkout/commit via that, because it will give you a better error message to diagnose the issue.
Man! Thank you. You stopped a herd of wild developers from hanging me. :)
Thank you for this.
You saved me from getting tarred and feathered :-)