svn commit: r195485 - in stable/7/sys: . contrib/pf kern

[Max Laier]

On Thursday 09 July 2009 19:31:26 Brian Somers wrote:
> On Thu, 9 Jul 2009 09:12:16 +0000 (UTC), Konstantin Belousov 
<kib at FreeBSD.org> wrote:
> > Author: kib
> > Date: Thu Jul  9 09:12:16 2009
> > New Revision: 195485
> > URL: http://svn.freebsd.org/changeset/base/195485
> >
> > Log:
> >   MFC r194993:
> >   In lf_iteratelocks_vnode, increment state->ls_threads around iterating
> >   of the vnode advisory lock list. This prevents deallocation of state
> >   while inside the loop.
> >
> > Modified:
> >   stable/7/sys/   (props changed)
> >   stable/7/sys/contrib/pf/   (props changed)
> >   stable/7/sys/kern/kern_lockf.c
>
> Just picking on this commit....
>
> Are the properties on stable/7/sys/contrib/pf intentional or should
> they merged into stable/7/sys (a no-op hopefully) and removed?

No it shouldn't[*].  The problem is that contrib/pf is - as the path suggests 
- backed by contributed code and thus has vendor specific merge info.

[*] That being said, I don't really care about the merge info in there - as it 
turns out, subversion's automerging capabilities are rather poor anyway and I 
can't see the benefit of the mergeinfo in dealing with vendor code.  It's 
always easy enough to figure out the revisions you want merged and you don't 
really need the mergeinfo for that.  OTOH, it is valuable meta-information 
that should be recorded - as I recall that's one reason why we switched to 
subversion in the first place.

One way out - which I proposed several times before but never got feedback on 
- would be to change the hierarchies in vendor-sys to have an extra 
sys/contrib prefix (e.g. vendor-sys/pf/dist/*sys/contrib*/pf/...).  This way 
we can record the mergeinfo in src/sys as well and get rid of the extra info 
in contrib/*  I'd need some feedback from svn-savvy people to go this road, 
though.

Before somebody asks why pf is the only offender - simply because it's the 
only sys/contrib source with a post-cvs merge of vendor code to the releng.

-- 
/"\  Best regards,                      | mlaier at freebsd.org
\ /  Max Laier                          | ICQ #67774661
 X   http://pf4freebsd.love2party.net/  | mlaier at EFnet
/ \  ASCII Ribbon Campaign              | Against HTML Mail and News