Re: CVS upgrade differences

[Rick Phillips]

OK, where's my STUPID sign.  

After some more experimentation, I realized that the issue is in the
"history" info string being inserted by CVS, which makes it a complete
non-issue.  The files listed are all in third-party source that we use,
internally we don't use the "history" info string.  

Sorry to waste everyone's time.

Rick Phillips

On Wed, 2007-09-05 at 11:03, Rick Phillips wrote:

> Among other things I am the CVS admin at our company.  We are
> currently using CVS version 1.11.2 and looking to upgrade to 1.12.13
> to take advantage of the "write-proxy" feature to better support some
> off-shore development being done.
> 
> Before doing the upgrade of our actual CVS server, I decided to
> prototype the upgrade on a backup system.  I took a copy of the
> current repository on put it on the prototype running CVS 1.11.2.  I
> then did several CVS operations to make sure everything was stable. 
> Among the things I did was a checkout of our entire source tree.
> 
> I then upgraded to CVS 1.12.13, and repeated all my tests, including
> the checkout.  
> 
> When I did a "diff -r --brief" on the two checkouts, I was surprised
> to find 41 file differences.  
> 
> Below is a list of the files that differed after a checkout under CVS
> version 1.11.2 and 1.12.13:  The problem always affect the first
> occurrence of the pattern "*^I$", "*^I^I$" or "*^I^I^M$" (vi "set
> list" format) and none of the ones after that (and there are ones
> after that).  All 41 of these files display exactly one of the
> differences listed in the examples below. 
> 
> I know that in every case below, the difference is in a comment and
> therefore won't create a problem compiling, etc.  BUT it really
> bothers me that version 1.12.13 apparently cannot accurately reproduce
> these files.  
> 
> Has anyone seen this problem before?  Have any other similar issues
> been seen that might affect us in the future. 
> 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/lm80.h 
> 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skaddr.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skcsum.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skdebug.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skdrv1st.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skdrv2nd.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skerror.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgedrv.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgehwt.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgei2c.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgeinit.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgepnm2.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgepnmi.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skgesirq.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/ski2c.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skqueue.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skrlmt.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/sktimer.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/sktypes.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skversion.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/skvpd.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/h/xmac_ii.h
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skaddr.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skcsum.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skdim.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skge.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skgehwt.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skgeinit.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skgemib.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skgepnmi.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skgesirq.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/ski2c.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/sklm80.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skproc.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skqueue.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skrlmt.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/sktimer.c 
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skvpd.c
> Support/phoenix/kernel/linux-2.4.24-uc0/drivers/net/sk98lin/skxmac2.c
> Support/Tools/DIAB_Compiler_Toolkit/compiler/4.3g/include/sys/acct.h
> Support/Tools/DIAB_Compiler_Toolkit/compiler/4.3g/libraries/include/include.unx/sys/acct.h
> 
> The following is an example from a skxmac2.c, see the RED highlight, note the 
> unchanged same pattern in BLUE.
> 
> 1.11.2 checkout:
> 
> $
> /******************************************************************************$
>  *$
>  * History:$
>  *$
>  *^I$Log: skxmac2.c,v $$
>  *^IRevision 1.1.1.1  2004/03/03 22:42:42  cvssvr$
>  *^I- Import snapgear's Kernel Distribution Linux 2.4.22-uc0$
>  *^I$
>  *^IRevision 1.99  2003/07/11 12:19:33  rschmidt$
>  *^IReduced init values for Master & Slave downshift counters to$
>  *^Iminimum values.$
>  *^IEditorial changes.$
>  *^I$
>  *^IRevision 1.98  2003/07/04 12:53:56  rschmidt$
>  *^IChanged setting of downshift feature in SkGmInitPhyMarv().$
> 
> 1.12.13 checkout:
> 
> $
> /******************************************************************************$
>  *$
>  * History:$
>  *$
>  *^I$Log: skxmac2.c,v $$
>  *^IRevision 1.1.1.1  2004/03/03 22:42:42  cvssvr$
>  *^I- Import snapgear's Kernel Distribution Linux 2.4.22-uc0$
>  *$
>  *^IRevision 1.99  2003/07/11 12:19:33  rschmidt$
>  *^IReduced init values for Master & Slave downshift counters to$
>  *^Iminimum values.$
>  *^IEditorial changes.$
>  *^I$
>  *^IRevision 1.98  2003/07/04 12:53:56  rschmidt$
>  *^IChanged setting of downshift feature in SkGmInitPhyMarv().$
> 
> Also another pattern is from acct.h
> 
> 
> 1.11.2 checkout:
>  *^I^IRevision 1.1.1.1  2001/08/13 19:22:21  maharig$
>  *^I^IInitial import of DIAB-SDS compiler toolkit 4.3g$
>  *^I^I$
>  *^I^IRevision 1.1.1.1  2001/08/13 16:46:28  maharig$
>  *^I^IInitial import of DIAB-SDS compiler toolkit 4.3g$
> 1.12.13 checkout:
>  *^I^IRevision 1.1.1.1  2001/08/13 19:22:21  maharig$
>  *^I^IInitial import of DIAB-SDS compiler toolkit 4.3g$
>  *$
>  *^I^IRevision 1.1.1.1  2001/08/13 16:46:28  maharig$
>  *^I^IInitial import of DIAB-SDS compiler toolkit 4.3g$
> One more pattern from the second acct.h in the list:
> 
> 1.11.2 checkout:
>  *^I^IRevision 1.1  2002/02/28 22:37:18  maharig$
>  *^I^IInitial revision$
> 
> *^I^I^M$
> 
>  *^I^IRevision 1.1  1994/03/29 00:42:23  fb^M$
>  *^I^IInitial version^M$
> 
> 1.12.13 checkout:
>  *^I^IRevision 1.1  2002/02/28 22:37:18  maharig$
>  *^I^IInitial revision$
>  *^M$
>  *^I^IRevision 1.1  1994/03/29 00:42:23  fb^M$
>  *^I^IInitial version^M$