fixing tag mess?

[Chris Ricker]

I did something like the following, as near as I can tell

$ cvs co FC-4
$ cd FC-4/fping
$ vi fping.spec (increase %{release} and :wq)
(cleverly forget to cvs commit my changes to fping.spec)
$ make tag

At that point, things blew up because I'd forgotten to commit the changed 
spec. When the make tag failed, I did the cvs commit. Now, make tag fails

$ make tag
cvs tag  -c fping-2_4b2-4_fc4
For more information on using the Fedora CVS repositories, please visit 
http://fedoraproject.org/wiki/UsingCvs
ERROR: Tag fping-2_4b2-4_fc4 has been already created.
The following tags have been created so far
fping-2_4b2-3:devel:kaboom:1116280180
fping-2_4b2-3_fc4:FC-4:kaboom:1117621441
fping-2_4b2-4_fc4:FC-4:kaboom:1117621501
cvs tag: Pre-tag check failed
cvs [tag aborted]: correct the above errors first!
make: *** [tag] Error 1
$ 

Checking the status shows that the files aren't yet tagged (2.4b2-4.fc4 is 
missing), however:

$ cvs status -v fping.spec
For more information on using the Fedora CVS repositories, please visit 
http://fedoraproject.org/wiki/UsingCvs
===================================================================
File: fping.spec        Status: Up-to-date

   Working revision:    1.3
   Repository revision: 1.3     /cvs/extras/rpms/fping/FC-4/fping.spec,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -ko

   Existing Tags:
        fping-2_4b2-3_fc4               (revision: 1.2)
        FC-4-start                      (revision: 1.1)
        FC-4-split                      (revision: 1.1)
        fping-2_4b2-3                   (revision: 1.1)

$ 

What's the best way to fix all this?

thanks,
chris