[boost] svn merge failed, pre-commit hook?