On Tue, Dec 13, 2005 at 08:50:51AM -0500, Christos Zoulas wrote:
> On Dec 13,  5:34pm, yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi) wrote:
> -- Subject: Re: CVS commit: src/sys
> 
> | btw, it seems that the merge involved lots of empty commits.  why?
> 
> I don't know. Perhaps it was whitespace changes? I just merged the branch
> in.  How pervasive is the problem? 10's of files? 100's?

Taking src/sys/lib/libsa/ffsv1.c as an example, checking out with -kk
gives the same file (identical including whitespace). So the difference
must be in the RCS Id:

$ cvs up -p -ko -rHEAD ffsv1.c                
===================================================================
Checking out ffsv1.c
RCS:  /home/pavel/cvs/src/sys/lib/libsa/ffsv1.c,v
VERS: 1.3
***************
/* $NetBSD: ffsv1.c,v 1.1.2.3 2004/09/21 13:36:18 skrll Exp $ */
<snip>

$ cvs up -p -ko -rnetbsd-3-base ffsv1.c       
===================================================================
Checking out ffsv1.c
RCS:  /home/pavel/cvs/src/sys/lib/libsa/ffsv1.c,v
VERS: 1.2
***************
/* $NetBSD: ffsv1.c,v 1.1 2003/04/11 11:28:54 dsl Exp $ */
<snip>

Bye	Pavel