From owner-cvs-src@FreeBSD.ORG Mon Nov 26 18:09:06 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75E1216A420; Mon, 26 Nov 2007 18:09:06 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 3904313C45B; Mon, 26 Nov 2007 18:09:06 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.1/8.14.1) with ESMTP id lAQHYgqN079063; Mon, 26 Nov 2007 09:34:42 -0800 (PST) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.1/8.14.1/Submit) id lAQHYgXw079062; Mon, 26 Nov 2007 09:34:42 -0800 (PST) (envelope-from obrien) Date: Mon, 26 Nov 2007 09:34:42 -0800 From: "David O'Brien" To: John Birrell Message-ID: <20071126173442.GC76927@dragon.NUXI.org> References: <200711232354.lANNsjmU040755@repoman.freebsd.org> <47476A52.8040508@FreeBSD.org> <20071124001008.GA44735@what-creek.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071124001008.GA44735@what-creek.com> X-Operating-System: FreeBSD 7.0-CURRENT User-Agent: Mutt/1.5.16 (2007-06-09) Cc: cvs-src@freebsd.org, Kris Kennaway , John Birrell , src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/binutils/opcodes ppc-dis.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2007 18:09:06 -0000 On Sat, Nov 24, 2007 at 12:10:08AM +0000, John Birrell wrote: > On Sat, Nov 24, 2007 at 01:03:30AM +0100, Kris Kennaway wrote: > > John Birrell wrote: > > >jb 2007-11-23 23:54:45 UTC > > > > > > FreeBSD src repository > > > > > > Modified files: > > > contrib/binutils/opcodes ppc-dis.c > > > Log: > > > Fix strict alias warnings. > > > > > > Revision Changes Path > > > 1.2 +119 -37 src/contrib/binutils/opcodes/ppc-dis.c > > > > Usually we try to avoid taking files off the vendor branch, it causes > > trouble for the person doing the vendor imports :( > > I know that. I nearly mentioned it in the commit message. > > 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. Let me add - I'm not sure you've done many contrib imports using CVS. Unless there is a CVS trick I'm not aware of - you don't get a choice to merge imports file by file. You do a merge of the import into HEAD and then go thru each conflicted file (which this file will now be a conflicted file) and get to go thru figure out what fixups to make. -- -- David (obrien@FreeBSD.org)