svn merge failed, pre-commit hook?
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: /branches/proto/v3/libs/graph/test/planar_input_graphs/planar_K_4_expansion_10_p6.dimacs ... 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. -- Eric Niebler Boost Consulting www.boost-consulting.com
on Mon Nov 05 2007, Eric Niebler <eric-AT-boost-consulting.com> wrote:
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
David Abrahams wrote:
What I expect: To be allowed to merge from trunk into my branch. Period. I don't know how these files got into trunk if they fail the pre-commit, and I don't really care. I have no beef with svn atomic commits. I have a beef with the pre-commit hook keeping me from getting stuff done. Can someone tell me how I can proceed? -- Eric Niebler Boost Consulting www.boost-consulting.com
on Tue Nov 06 2007, Eric Niebler <eric-AT-boost-consulting.com> wrote:
What I expect:
To be allowed to merge from trunk into my branch. Period.
This is a technicality, but you can always do a merge. You just can't check the changes in if they fail the pre-commit hook.
I understand your frustration, but if the "stuff" involves violating the rules it's set up to enforce, the pre-commit hook is doing exactly what it's designed to do.
Can someone tell me how I can proceed?
I guess fixing the files on the trunk is the only way to handle something like this. Undoubtedly their presence on trunk predates our automated checks (http://svn.boost.org/trac/boost/changeset/38956). -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
Aaron Windsor wrote:
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
participants (3)
-
Aaron Windsor -
David Abrahams -
Eric Niebler