From: Eric Niebler (eric_at_[hidden])
Date: 2007-11-06 15:33:29
Aaron Windsor wrote:
> On 11/5/07, Eric Niebler <eric_at_[hidden]> wrote:
>> I just tried to merge a bunch of changes from trunk into a branch, and
>> got this:
>> svn: Commit failed (details follow):
>> svn: MERGE request failed on '/svn/boost/branches/proto/v3'
>> svn: 'pre-commit' hook failed with error output:
>> File names with > 31 characters:
>> ... and a bunch more files like it. So, really? I can't merge *any*
>> changes from trunk because some files are rejected by the pre-commit
>> hook? That's a bit extreme. It's nice to enforce our file name
>> requirements, but please let me do my work.
> Hi Eric,
> I just renamed all test files in that directory to < 32 characters.
> Can you try again now?
After much grappling with svn and svnmerge.py, I finally was able to
successfully merge my branch with trunk and commit my changes. I had to
revert some merged changes, do a partial commit, run svnmerge.py again,
and finally commit everything. That was rather painful.
Thanks for your help.
-- Eric Niebler Boost Consulting www.boost-consulting.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk