authz question: can I disallow file change commits but still allow merge property commits

Hi,

Where I work we have the developers divided into senior and non-senior
developers. Certain parts of the codebase can only be changed by senior
devs (DB access, billing, etc.). We are using svn 1.5 and our entire
repository was exported and re-imported to convert it to 1.5.

Our authz file contains lines like:

[/trunk/src/opt]
@developers = rw
@seniors = rw

[/trunk/src/opt/Billing]
@developers = r
@seniors = rw

[/branches]
@developers = rw
@seniors = rw

So all developers can commit to the non-billing parts of trunk, and can
commit anywhere in branches. Senior devs can commit anywhere.

However we are having problems when developers try to merge back into
trunk. Even though they have not actually edited any files in the
billing area, there are merge property changes on some of these files.
These property changes seem to prevent them from merging back to trunk
which means that senior developers need to get involved.

Is there a way to allows developers to commit merge property changes to
sensitive areas of trunk while still preventing anyone but senior
developers from commiting actual file content changes?

I have googled about this over a week or so, but didn't find anything
that seemed to help. Perhaps I'm not using the correct terms or something.

Any help or pointers will be gratefully received.

Thanks.

Dave Webb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2367760

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-03 12:01:59 CEST