Re: cvs commit: src/contrib/binutils/opcodes ppc-dis.c

From: David O'Brien <obrien_at_freebsd.org>
Date: Mon, 26 Nov 2007 09:34:42 -0800
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_at_FreeBSD.org)
Received on Mon Nov 26 2007 - 18:09:06 UTC