[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge tracking: rejecting commits from svn clients < 1.5

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2007-02-14 13:08:54 CET

On Tue, Feb 13, 2007 at 11:58:07AM -0800, Blair Zajac wrote:
> I think we would still want to force a way for a pre-commit script to
> reject a client using file:///.

file:/// clients, by definition, can do anything to the repository,
including corrupting it beyond all recognition. Adding any kind of
security to ra_local is basically not going to work - the client is
responsible for enforcing it.

But, really, what are we trying to fix here? The problems caused by
someone committing using a non-merge-tracking client? Assuming you have
any kind of post-commit review, you should spot the problem immediately.

Even if not, once you've spotted the problem (I'm assuming the symptoms
would typically be a repeated merge, so you'd probably get a conflict
merging to the branch), you can just fix it using the 'svn merge'
equivalent of svnmerge.py's --record-only option.

You can also tell people "Don't do that". I find that frequently works
a lot better than constructing a technical solution.


  • application/pgp-signature attachment: stored
Received on Wed Feb 14 13:09:27 2007

This is an archived mail posted to the Subversion Dev mailing list.