From: David Abrahams (dave_at_[hidden])
Date: 2007-11-06 00:46:18
on Mon Nov 05 2007, Eric Niebler <eric-AT-boost-consulting.com> 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.
I don't understand what you expect. SVN does atomic commits; the idea
is that you can keep the repo in an always-working state, so either
the whole checkin works, or it fails.
-- Dave Abrahams Boost Consulting http://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