« 1/31 | Main | cvs_report updates/common build »

CVSR/Toolchain

  • Worked on CVS Report section of web site
  • Attempting to determine what ECRs were picked up for the toolchain. Found what I think might be a CVS tagging issue

Either I really just don't understand CVS branching or perhaps we have an error in tagging. I have written a Perl script that will report the ECRs involved between two different CVS tags. When I run this script on the toolchain, comparing tags Lion_com3_2_2_120204 -> Lion_com3_2_2_121604 I see odd results. I believe that the only real ECR involved here is ECR #23084. The following appears in Quintus for that ECR:

/cvs/gcc-cvs/toolchain/src/ChangeLog.lynx,v  <--  ChangeLog.lynx
new revision: 1.25.2.31; previous revision: 1.25.2.30

/cvs/gcc-cvs/toolchain/src/gcc/config/lynx.c,v  <--  lynx.c
new revision: 1.2.2.1; previous revision: 1.2

[Check-ins] on trunk

/cvs/gcc-cvs/toolchain/src/gcc/ChangeLog.lynx,v  <--  ChangeLog.lynx
new revision: 1.7; previous revision: 1.6

/cvs/gcc-cvs/toolchain/src/gcc/config/lynx.c,v  <--  lynx.c
new revision: 1.3; previous revision: 1.2

However I also notice the following WRT the file src/ChangeLog.lynx:

$ cvs log toolchain/src/ChangeLog.lynx
...
    Lion_com3_2_2_121604: 1.25.2.31
...
    Lion_com3_2_2_120604: 1.25.3.28
...
revision 1.25.2.31
date: 2004/12/15 23:48:49;  author: anemet;  state: Exp;  lines: +6 -0
        ECR 23084
...
revision 1.25.2.30
date: 2004/12/14 15:28:22;  author: orepin;  state: Exp;  lines: +17 -0
        ECR 22875
...
revision 1.25.2.29
date: 2004/12/14 09:26:25;  author: orepin;  state: Exp;  lines: +8 -0
        ECR 22805
...
revision 1.25.2.28
date: 2004/11/23 15:35:16;  author: aneyman;  state: Exp;  lines: +8 -0
        ECR 22989
...
$

So, to me, the ECRs that changed between the CVS tags of Lion_com3_2_2_120204 and Lion_com3_2_2_121604 WRT src/ChangeLog.lynx would be

  1. 23084
  2. 22875
  3. 22805

(I assume that ECR #22989 was included with the previous toolchain).

Or am I just looking at this the wrong way?

Futhermore, the other files associated with, for example, ECR #22875, are:

  • toolchain.cvsr/src/gdb/gdbtypes.h: 1.2.4.1
  • toolchain.cvsr/src/ChangeLog.lynx: 1.25.2.30
  • toolchain.cvsr/src/gdb/gdbtypes.c: 1.2.4.1
  • toolchain.cvsr/src/gdb/config/i386/tm-i386lynx.h: 1.2.4.3

Yet, other than ChangeLog.lynx, all other files have tags that suggest that nothing else changed! For example, gdbtypes.h has Lion_com3_2_2_120204 pointing to revision 1.2 and Lion_com3_2_2_121604 also pointing to 1.2! Likewise for gdbtypes.c and config/i386/tm-i386lynx.h. Is this a tagging error?