«
»

MERGE request failed on ‘/path/to/file’

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.

  • Twitter
  • Digg
  • del.icio.us
  • DZone
  • Reddit
  • email

Tags: ,

This entry was posted on Monday, May 21st, 2007 at 13:37 and is filed under Features, General. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.

8 Responses to “MERGE request failed on ‘/path/to/file’”

  1. anonim says:
    18 September, 2007 at 17:26

    Thanks dude. I had the same error and I had no clue on how to fix it.

    Thanks again

  2. Chris Hill says:
    16 January, 2008 at 21:44

    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.

  3. bascht says:
    6 June, 2008 at 09:55

    Man! Thank you. You stopped a herd of wild developers from hanging me. :)

  4. Gaetan Lauff says:
    11 July, 2008 at 19:43

    Thank you for this.
    You saved me from getting tarred and feathered :-)

  5. James says:
    25 October, 2008 at 03:53

    Brilliant. Thanks so much!

  6. jlevy says:
    14 January, 2009 at 09:16

    Yet another svn admin helped. This did the trick. Big thanks.

  7. Markus says:
    16 May, 2009 at 14:33

    After updating post-commit and trac-post-commit-hook I still get the same error message.
    Is this may be because I’m using trac 0.11.2 and not 0.10.x?

  8. Patrick says:
    11 December, 2009 at 04:52

    Thank you. Fixed it for me too.

Leave a Reply