6

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

 3 years ago
source link: https://www.devroom.io/2007/05/21/merge-request-failed-on-pathtofile/?utm_campaign=Feed%3A+ariejan+%28ariejan%7Cdevroom.io%29
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.

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

Posted: 2007-05-21 - Last updated: 2019-06-05

Tagged general features subversion trac

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.

My site is free of ads and trackers. I record privacy-respecting usage statistics with Fathom.

Was this post helpful to you? Why not ☕ Buy me a coffee

Copyright © 1999-2020 Ariejan de Vroom <[email protected]>

Live now; make now always the most precious time. Now will never come again.
    – Jean-Luc Picard


About Joyk


Aggregate valuable and interesting links.
Joyk means Joy of geeK