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. Thanks, Emil Dotchevski Reverge Studios, Inc. http://www.revergestudios.com/reblog/index.php?n=ReCode
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: http://svn.boost.org/trac/boost/wiki/BoostSubversion - Doug
On Mon, Jun 2, 2008 at 7:08 PM, Douglas Gregor <dgregor@osl.iu.edu> wrote:
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. Emil Dotchevski Reverge Studios, Inc. http://www.revergestudios.com/reblog/index.php?n=ReCode
On Jun 2, 2008, at 10:46 PM, Emil Dotchevski wrote:
On Mon, Jun 2, 2008 at 7:08 PM, Douglas Gregor <dgregor@osl.iu.edu> wrote:
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 going wrong. - Doug
On Tue, Jun 3, 2008 at 6:37 AM, Doug Gregor <dgregor@osl.iu.edu> wrote:
3) Checks for an empty log message
That was it. I forgot to type a log message!
Hmm... which version of the Subversion client are you using?
I'm using Tortoise 1.4.8. I am not sure if it's Tortoise problem or not, but it would be nice if there is a way to get it to display a proper error message. Thanks! Emil Dotchevski Reverge Studios, Inc. http://www.revergestudios.com/reblog/index.php?n=ReCode
2008/6/3 Doug Gregor <dgregor@osl.iu.edu>:
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 going wrong.
Are the hook scripts stored in subversion for everyone to see? If not; I think both these and the current recommended client side configuration should be placed in subversion. /$
participants (4)
-
Doug Gregor -
Douglas Gregor
-
Emil Dotchevski -
Henrik Sundberg