On Sun, 2007-08-19 at 12:54 +0100, Paul A Bristow wrote:
Modified: I:\boost-sandbox\math_toolkit\libs\math\doc\distributions\binomial.qbk Sending content: I:\boost-sandbox\math_toolkit\libs\math\doc\distributions\binomial.qbk Error: Commit failed (details follow): Error: MERGE request failed on '/svn/boost/sandbox/math_toolkit/libs/math/doc/distributions' Error: 'pre-commit' hook failed with error output:
I'm sure I've done something naughty here, but some clues as to what would be really nice ;-)
Is this 'null message' a bug or a feature?
The pre-commit check is a feature, the fact that the Subversion client fails to provide you with the error output is a bug. Since this is a *.qbk file, and the original Subversion page omitted auto-properties for *.qbk files, I'm guessing that you'll need to add two properties to your file: svn:eol-style should be native svn:mime-type should be text/plain See the "MIME Types and End-of-line Styles" section on: http://svn.boost.org/trac/boost/wiki/BoostSubversion If you've already set up the auto-props as it describes there, but sure to copy in the *.qbk line, which is relatively new. - Doug