[GRASS5] Time to go mad: CVS completely messed up?!

[Glynn Clements]

Bernhard Reiter wrote:

> On Tue, Aug 14, 2001 at 06:11:31PM +0100, Glynn Clements wrote:
> 
> > Bear in mind that any information regarding the
> > releasebranch_11_april_2001_5_0_0 tag may be completely bogus. If my
> > suspicion is correct, the repository has been tagged twice with this
> > tag.
> 
> I am still in the process of inquiring.
> Please _hold_ to commit changes to the CVS,
> until we can find out what has happened.
> 
> Glynn: It looks like your suspicion might be correct. 
> According to the following output,
> a command which everybody can use to find out about the
> Tags and Branches of a file without checking out the file,
> "releasebranch_11_april_2001_5_0_0" is not a branch.

Well, it is and it isn't.

> $ cvs -z2 status -v main.c
> ===================================================================
> File: main.c           	Status: Up-to-date
> 
>    Working revision:	1.3
>    Repository revision:	1.3 /grassrepository/grass/src/display/d.rgb/cmd/main.c,v
>    Sticky Tag:		(none)
>    Sticky Date:		(none)
>    Sticky Options:	(none)
> 
>    Existing Tags:
> 	releasebranch_14_august_2001_5_0_0	(branch: 1.3.4)
> 	releasebranch_11_april_2001_5_0_0	(revision: 1.3)

[snip]

This file was removed from the release branch when I re-wrote d.rgb.
The new version doesn't have a "cmd" subdirectory; there, the tag *is*
a branch tag:

[glynn at cerise grass]$ cvs -z2 status -v src/display/d.rgb/main.c
===================================================================
File: main.c           	Status: Up-to-date

   Working revision:	1.1.2.2
   Repository revision:	1.1.2.2	/grassrepository/grass/src/display/d.rgb/Attic/main.c,v
   Sticky Tag:		releasebranch_14_august_2001_5_0_0 (branch: 1.1.2.2.2)
   Sticky Date:		(none)
   Sticky Options:	(none)

   Existing Tags:
	releasebranch_14_august_2001_5_0_0	(branch: 1.1.2.2.2)
	release_grass500pre1_20_may_2001	(revision: 1.1.2.1)
	releasebranch_11_april_2001_5_0_0	(branch: 1.1.2)

I'm pretty convinced that CVS has ended up with two distinct
"releasebranch_11_april_2001_5_0_0" tags, one a branch, one not. 
Unfortunately, attempting to update the branch pulls in all of the
files with the non-sticky version of the tag.

-- 
Glynn Clements <glynn.clements at virgin.net>