Date: Tue, 24 Nov 2009 11:24:46 -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: <200911241124.46293.jhb@freebsd.org> In-Reply-To: <85603446-C587-4AD5-91B0-653D106117BF@mac.com> References: <200911240317.nAO3H0P6003552@svn.freebsd.org> <200911240451.46875.max@love2party.net> <85603446-C587-4AD5-91B0-653D106117BF@mac.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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. The mergeinfo on the contrib directories is actually quite valid b/c they have metadata from multiple locations. These were not the results of merges into the wrong directories, but the results of merges from vendor trees into HEAD. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911241124.46293.jhb>