[SVN] Trouble with commitment
In trying to commit an update, I'm getting the following message: Error Commit failed(details follow) Error MERGE request failed on '/svn/boost/branches/serialization_next_release/regression' Error 'pre-commit" hook failed with error output: And that's it - no indication of what I might to do permit this go through. Any help appreciated. Robert Ramey
In trying to commit an update, I'm getting the following message:
Error Commit failed(details follow) Error MERGE request failed on '/svn/boost/branches/serialization_next_release/regression' Error 'pre-commit" hook failed with error output:
Looks like you forgot to "svn update" before committing and there's a conflict on some file. Philippe
Actually I was wrong, looks like a known problem between svn & trac : http://64.233.183.104/search?q=cache:6abPHiy-Y5wJ:ariejan.net/2007/05/21/merge-request-failed-on-pathtofile/+%22MERGE+request+failed+on%22&hl=en&ct=clnk&cd=3 But I also read it might be because your OS is locking the directory/file subversion needs to modify, e.g if you move a directory around and you still have an open file in that directory. Philippe
Philippe Vaucher wrote:
In trying to commit an update, I'm getting the following message:
Error Commit failed(details follow) Error MERGE request failed on '/svn/boost/branches/serialization_next_release/regression' Error 'pre-commit" hook failed with error output:
Looks like you forgot to "svn update" before committing and there's a conflict on some file.
I thought you normally got a more informative message in that case. BTW Paul Bristow has been having the same problem intermittently, but we've never figured out why. It would be nice to get to the bottom of this if possible! HTH, John.
-----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Robert Ramey Sent: 12 September 2007 16:58 To: boost@lists.boost.org Subject: [boost] [SVN] Trouble with commitment
In trying to commit an update, I'm getting the following message:
Error Commit failed(details follow) Error MERGE request failed on '/svn/boost/branches/serialization_next_release/regression' Error 'pre-commit" hook failed with error output:
And that's it - no indication of what I might to do permit this go through.
Any help appreciated.
I also got this message when file type was wrong/no registered in MY config file. eg .qbk Is it a funny type? Paul --- Paul A Bristow Prizet Farmhouse, Kendal, Cumbria UK LA8 8AB +44 1539561830 & SMS, Mobile +44 7714 330204 & SMS pbristow@hetp.u-net.com
On Sep 12, 2007, at 2:17 PM, Paul A Bristow wrote:
-----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Robert Ramey Sent: 12 September 2007 16:58 To: boost@lists.boost.org Subject: [boost] [SVN] Trouble with commitment
In trying to commit an update, I'm getting the following message:
Error Commit failed(details follow) Error MERGE request failed on '/svn/boost/branches/serialization_next_release/regression' Error 'pre-commit" hook failed with error output:
And that's it - no indication of what I might to do permit this go through.
Any help appreciated.
I also got this message when file type was wrong/no registered in MY config file.
eg .qbk
Is it a funny type?
The lack of an error message seems to be a bug in some versions of the Subversion client. I haven't found a workaround (yet), but we should keep looking. The Subversion repository is probably rejecting your file because it doesn't have a mime-type. Does your Subversion config file have the following in the auto-props section? *.qbk = svn:eol-style=native; svn:keywords=Id; svn:mime- type=text/plain This line was added late to http://svn.boost.org/trac/boost/wiki/ BoostSubversion , so not everyone has added it into their local config files. This will assign appropriate properties to a .qbk file when you "svn add" it, and get past the pre-commit checker. - Doug
participants (5)
-
Douglas Gregor -
John Maddock -
Paul A Bristow -
Philippe Vaucher -
Robert Ramey