Date: Tue, 24 Nov 2009 14:32:50 -0500 From: John Baldwin <jhb@freebsd.org> To: Marcel Moolenaar <xcllnt@mac.com> Cc: Marcel Moolenaar <marcel@freebsd.org>, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Max Laier <max@love2party.net> Subject: Re: svn commit: r199729 - stable/8/sys/ia64/include Message-ID: <200911241432.50925.jhb@freebsd.org> In-Reply-To: <EB3A21A1-82A2-467E-8AD6-613D7CD77104@mac.com> References: <200911240317.nAO3H0P6003552@svn.freebsd.org> <200911241124.46293.jhb@freebsd.org> <EB3A21A1-82A2-467E-8AD6-613D7CD77104@mac.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tuesday 24 November 2009 2:00:54 pm Marcel Moolenaar wrote: > > On Nov 24, 2009, at 8:24 AM, John Baldwin wrote: > > > On Monday 23 November 2009 11:17:00 pm Marcel Moolenaar wrote: > >> On Nov 23, 2009, at 7:51 PM, Max Laier wrote: > >> > >>>> Modified: > >>>> stable/8/sys/ia64/include/asm.h > >>>> Directory Properties: > >>>> stable/8/sys/ (props changed) > >>> > >>> 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. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911241432.50925.jhb>