Date: Mon, 26 Nov 2007 12:24:48 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: John Birrell <jb@what-creek.com> Cc: cvs-src@FreeBSD.org, Kris Kennaway <kris@FreeBSD.org>, John Birrell <jb@FreeBSD.org>, cvs-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: cvs commit: src/contrib/binutils/opcodes ppc-dis.c Message-ID: <861wad5jwf.fsf@ds4.des.no> In-Reply-To: <20071124001008.GA44735@what-creek.com> (John Birrell's message of "Sat\, 24 Nov 2007 00\:10\:08 %2B0000") References: <200711232354.lANNsjmU040755@repoman.freebsd.org> <47476A52.8040508@FreeBSD.org> <20071124001008.GA44735@what-creek.com>
next in thread | previous in thread | raw e-mail | index | archive | help
John Birrell <jb@what-creek.com> writes: > On Sat, Nov 24, 2007 at 01:03:30AM +0100, Kris Kennaway wrote: > > Usually we try to avoid taking files off the vendor branch, it > > causes trouble for the person doing the vendor imports :( > I think it's a change that doesn't need to be merged. If a new version is > imported, _that_ needs to be build clean. Changes that don't need to be merged are normally committed to the vendor branch. Having a file off the vendor branch will cause trouble during future imports regardless of whether there are changes to merge. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?861wad5jwf.fsf>