[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: Blair Zajac <blair_at_orcaware.com>
Date: 2007-02-14 22:54:24 CET

Daniel Rall wrote:
> On Wed, 14 Feb 2007, Blair Zajac wrote:
>> Malcolm Rowe wrote:
> ...
>>> 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.
>> Again, work after things are messed up. I would rather just have an
>> easy solution that I don't have to think about it later.
>> I don't see it hard having the svn client provide an environmental
>> variable that the pre-commit script can look for the existence of.
> Well, Kamesh pointed out that it is actually quite hard. How can the
> repository differentiate "normal"-commit vs. commit-of-merge?

I don't care to distinguish the two.

I would just rather have a way to exclude any clients that don't provide
merge tracking support rather than distinguish between a normal-merge vs
a commit-of-merge.

Much easier to exclude all clients < 1.5 and have a company policy that
any clients that come online need to be >= 1.5 than to distinguish
between types of merges.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 14 22:55:00 2007

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