How to lock SVN trunk except for merges from branc

Question

I'd like to prevent developers working directly on the trunk.

I'm aiming to enforce all developers off the trunk and to work on there own branches until CI tests are cleared. They then have to merge from the trunk to their branch (to pick up latest changes), run and pass tests before they merge back to the trunk.

Is there any rules for this style of SVN usage?

Answer 1

I'm not an SVN expert by any means, and Daniel's answer makes sense, so I might need an SVN/WebDAV expert to tell me why this wouldn't work:

This page documents the WebDAV methods used by various SVN commands. And it appears that you could "lock" commit, rm, copy, mv, and mkdir by denying a user permission to use the MKACTIVITY method. This would still allow diff, merge, checkout, ls, cat, etc.

So then all you would need to do is set up, in your Apache config, a <Limit> or a <LimitExcept> directive inside of a <Location> directive corresponding to the trunk directory. I haven't tested this out, but it would look something like:

<Location /repo/myproject/trunk>
    ...
    AuthType Digest
    AuthName "Repository Admins Only"
    AuthDigestProvider file
    AuthUserFile "E:/Sites/.htpasswd-admin"
    <Limit MKACTIVITY>
        Require valid-user
    </Limit>
    ...
</Location>

And you should be able to nest that inside of your repository's main <Location> directive. This is all assuming you're using HTTPS to access your repository.

Answer 2

It would be a lot simpler to have your developers work on the trunk, but not commit changes "until they are happy". Your developers can more easily update their code with the committed changes made by the other developers.

The setup you describe is more for developers that have to get express authorization from a manager or a user before they merge their changes. You also have to manually manage the branch changes from one developer to the other developers that need those changes for their change. (Branch to branch merging).

I deny access to the Cobol developers in my group access to SVN trunk. I did it by writing my own Eclipse plug-in that automatically creates branches and performs the merge back to trunk.

Answer 3

You cannot do that. Either they can write to a directory or they can't.

However, you might be able to write a pre-commit hook that detects if they're trying to do this and abort if that's the case.

Answer 4

You have to setup a commit hook which handles this situation. But I'm not sure if you really can separate a commit to trunk from a merge to the trunk (May be based on svn:mergeinfo change)...but i would recommend to describe the need for that to the developers instead forcing it...and by the way the commit script must be written and tested and that's an effort which i think is not really needed if you explain that to devs.

Answer 5

To allow only merges into the trunk, you could use a pre-commit hook that tries to distinguish merges from ordinary commits and rejects the latter. You can tell whether a commit is a merge by checking if it changes the "svn:mergeinfo" property on any path. This mailing list thread has two examples of hooks that check for mergeinfo. The examples are actually trying to enforce its absence on specific paths, but if you reverse the logic, you can make a hook that accepts only merges.

It would still be possible for a developer to deliberately slip in other changes along with the merge, and it's not reasonably possible to detect that. Such a pre-commit hook will work as a gentle reminder to the developers that they probably meant to check in to a branch and not the trunk, but it only works as long as they're not deliberately trying to sneak around the policy.

A more ironclad solution would be to limit write access to the trunk to a small number of users whom you trust to do the right thing. Those users will then have to do the final "merge back to the trunk" step in every case. If the developers have already merged from the trunk to their own branch, then this final merge back is trivial to do, so would not be a great burden on your trusted users. In fact, the final merge back can even be done by an automated process whenever developers flag their branch as "ready to merge". I've seen in-house implementations of such an automatic merge process, but I don't know of anything publicly available.

Answer 6

Limit trunk commits to a bot. That bot can do the conflict-free merge and commit to trunk. I've done just that; it's called mergebot (MIT licensed). It's a daemon and a Trac plugin to provide a way to have a branch per-ticket. Docs are thin, there are issues in corner cases, but it mostly just works.