Subversion MERGE error on commit nailed

Wednesday, August 20. 2008

Recently I've had a problem with subversion commits returning a '200 OK' result, accompanied by a peculiar MERGE error (when I'm not doing a merge), but weirdly, the commit had actually made it into the repo. I'd googled for this a while ago with no success, but I had another try today and found this post. Thinking about it, I'd had this problem since updating to the very-very-long-awaited trac 0.11 release. So I tracked down the latest release of the trac-post-commit-hook script and installed that, and amazingly enough, it just works. Thank you UberGeek!

Trackbacks


Trackback specific URI for this entry
    No Trackbacks

Comments


    No comments

Add Comment

You can use [geshi lang=lang_name [,ln={y|n}]][/geshi] tags to embed source code snippets.

To prevent automated Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Your comment will only be submitted if the strings match. Please ensure that your browser supports and accepts cookies, or your comment cannot be verified correctly.
CAPTCHA

    Submitted comments will be subject to moderation before being displayed.