On Dec 14,  9:36am, yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi) wrote:
   -- Subject: Re: CVS commit: src/sys
   
   | > 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:
   | 
   | it explains empty diffs.  thanks.
   | i'd recommend to use -kk when working on branches. :-)
   
   That does not work either... because then the id's don't get expanded...


or worse, the -kk gets commited to the file affecting everyone.



.mrg.