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

[John Baldwin]

On Friday 10 July 2009 4:32:43 am Brian Somers wrote:
> we might need to import it in two pieces so that we can maintain the
> contrib/some-package part of the hierarchy when merging sys/, even
> though the other two hierarchies can be merged directly into src/etc
> and usr.bin/program directly.

We actually already have that split up since vendor and vendor-sys are 
separate.  However, I think the idea was to try to keep the trees under 
vendor and vendor-sys as pristine as possible.
 
> However, the bit that I don't understand about the original commit and
> its update of the contrib/pf mergeinfo is why it's updated at all by svn
> - it just seems wrong.  When I do:
> 
>     cd svn/stable/7/sys
>     svn merge -c NNNNN ^/head/sys
> 
> given that change NNNNN has nothing to do with pf, I don't understand
> why subversion updates stable/7/sys/contrib/pf's mergeinfo.  Is the
> "special" thing about sys/contrib/pf just that it already has mergeinfo
> associated with it?  And if so, why does that make it special.  Surely
> having NNNNN in sys's mergeinfo implies that it's been merged to
> every part beneath sys.

No, mergeinfo is _not_ inherited, so the mergeinfo for sys/ has to be 
duplicated in sys/contrib/pf.

-- 
John Baldwin