svn commit: r199729 - stable/8/sys/ia64/include

Marcel Moolenaar xcllnt at mac.com
Tue Nov 24 19:56:14 UTC 2009


*snip*

>>>>> These MFCs seem to be missing mergeinfo for the contrib directories.
>>>> 
>>>> I pruned them. We don't seem to get rid of merge into in the
>>>> wrong directories even even people try to clean it up...
>>> 
>>> That was the wrong thing to do.
>> 
>> *sigh*
>> 
>> I can't keep up with this...
> 
> Generally you can just commit whatever svn merge gives you.  Having a few 
> extra properties in the kernel tree is "normal" for stable/[678].  (I think 
> stable/6 only has one extra: contrib/pf).  I do try to clean up merges into
> the wrong directories, but in the case of vendor merges there isn't anything
> to clean unless we reorganize the vendor-sys trees so that they always merge 
> to sys.

Do you want me to --record-only what I pruned or can we leave it
as is with the note not to prune?

-- 
Marcel Moolenaar
xcllnt at mac.com





More information about the svn-src-stable-8 mailing list