From: Doug Gregor (dgregor_at_[hidden])
Date: 2008-06-03 09:37:37
On Jun 2, 2008, at 10:46 PM, Emil Dotchevski wrote:
> On Mon, Jun 2, 2008 at 7:08 PM, Douglas Gregor <dgregor_at_[hidden]>
>> On Jun 2, 2008, at 5:09 PM, Emil Dotchevski wrote:
>>> I'm trying to commit a change to a file and I'm getting this error:
>>> Commit failed (details follow):
>>> MERGE request failed on '/svn/boost/trunk/libs/exception/doc/source'
>>> 'pre-commit' hook failed with error output:
>>> That's all I get. Any clues? I've made changes to the same file
>>> several times before and I have never experienced this problem.
>> Are you adding a new file? If so, you'll need to set the mime type
>> and end-of-line style, as described here:
> No this is not a new file. I did specify the mime and end-of-line
> settings when the file was added weeks ago and I have been able to
> successfully update that file many times since then, until today.
Hmm... which version of the Subversion client are you using? Some
(older?) versions fail to display the result of the pre-commit hook,
which is obviously happening here. Otherwise, the pre-commit hook does
a good job of saying what it doesn't like.
The pre-commit hook does three things:
1) Checks for problems on case-insensitive file systems, e.g., where
there's a file in the repository already that would have the same name
as a file you're committing on a case-insensitive file system.
2) Checks for mime-type and eol-style.
3) Checks for an empty log message
Worst case, you can send the change to me and I'll figure out what's
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk