On Thu, Mar 04, 2004 at 01:20:11PM -0600, James Chacon wrote:
> On Thu, Mar 04, 2004 at 11:09:50AM -0800, Jeremy C. Reed wrote:
> > The "Announcing NetBSD 1.6.2" notes say:
> > 
> >    CVS has been upgraded to version 1.11.10
> > 
> > But when I built netbsd-1-6, my cvs command still shows:
> > 
> > stilly:/usr/xsrc$ /home/livecd/netbsd-1-6-destdir/usr/bin/cvs --version
> > 
> > Concurrent Versions System (CVS) 1.11.5 (client/server)
> > ...
> > 
> > My source does have new versions, because:
> > 
> > stilly:/usr/xsrc$ ident /usr/src/gnu/dist/cvs/cvs2netbsd
> > /usr/src/gnu/dist/cvs/cvs2netbsd:
> >      $NetBSD: cvs2netbsd,v 1.1.2.2 2003/12/17 17:40:52 christos Exp $
> > 
> > And ChangeLog and NEWS mention newer than 1.11.5.
> > 
> > Does /usr/src/gnu/usr.bin/cvs/include/config.h need to be updated too for
> > netbsd-1-6?
> 
> Looks like it. The joys of no formal testing and people not pre-testing their
> pullups...

Actually even better. It looks like the trunk is wrong (I thought you were
looking at 1.6 source). So the branch is as correct as the trunk which is to
say "not fully merged". This import should be cleaned up, finished merging
and pullups for any missing bits sent to pullup-1-6 as well.

James