I was referred here by http://drupal.org/node/57516 ('Resolving the Sticky tag is not a branch issue').

It seems that I made a large error early on in using CVS. I created a HEAD tag without realizing that HEAD exists by default. For example:

File: CHANGELOG.txt     Status: Up-to-date

   Working revision:    1.2
   Repository revision: 1.2     /cvs/drupal-contrib/contributions/modules/mysite/CHANGELOG.txt,v
   Commit Identifier:   2f50453e842f4567
   Sticky Tag:          HEAD (revision: 1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

If I understand correctly, that sticky tag should not exist, and it prevents me from maintaining HEAD correctly.

As a result, I have been doing all development on the 4-7 and 5-0 branches, and HEAD is broken for my project. http://drupal.org/project/mysite.

I'm trying to bring HEAD in line with the 5-0 branch of the module, so that I can do new feature development in HEAD as described in http://drupal.org/node/17570#HEAD.

Now, when I try to fix HEAD using 'cvs tag -d HEAD', I get the message:

** ERROR: You are not allowed to delete or move tags that have 
** release nodes pointing to them. "HEAD" is being used by 
** http://drupal.org/node/96835

Any help and instruction that can be provided for fixing this issue would be greatly appreciated.

Note: I am using command-line CVS and have been able to update release nodes properly. It is only HEAD that is broken.

Comments

dww’s picture

Project: Project » Drupal.org infrastructure
Version: x.y.z »
Component: Projects » CVS
Status: Active » Closed (works as designed)

(i changed my mind where these support requests should go, and updated the handbook page accordingly).

If I understand correctly, that sticky tag should not exist, and it prevents me from maintaining HEAD correctly.

no, you don't understand correctly at all. ;)

HEAD is just the trunk of the repository, the "branch that isn't a branch". i suggest you (re)read http://drupal.org/handbook/cvs/introduction ...

what makes you think there's something wrong with your HEAD workspace? have you tried to commit changes to it and got an error? i'm guessing no.

you're just confused about what a "sticky tag" means. i suggest you read some CVS docs if you really care. or browse through the d.o cvs handbook pages, i think i've explained this somewhere on the site already.

thankfully, all the access checks prevented you from doing anything you shouldn't have done. ;)

you don't need to delete any release nodes, and you certainly don't need to delete, move, or otherwise modify your "HEAD" tag. CVS takes care of that for you.

agentrickard’s picture

Thanks.

I'll take another run at the documentation and report back, but I filed the issues because I've reread that 3 times and it lead me to the 'sticky tag is not a branch' error when trying to commit under HEAD.

I was also getting errors when trying to add files to HEAD (cvs add failures). If I get those again, I will follow up here.

dww’s picture

that's *really* weird. try running "cvs update -A" in your workspace and see if that helps.

agentrickard’s picture

Which workspace? (This is where I get confused).

I currently have 3 local workspaces; one for each branch:

/path/4-7/contributions/modules/mysite
/path/5-0/contributions/modules/mysite
/path/HEAD/contributions/modules/mysite

So when I checkout a branch, I do so from in the corresponding local workspace.

So do I cd to:

/path/5-0/contributions/modules/mysite

and run cvs update -A

This is the part I didn't understand from the original handbook comment thread about update -A.

(Of course, it could be that my cvs methods are just hopelessly backwards, but using the three workspaces has kept me from making any major errors in releases.)

agentrickard’s picture

Status: Closed (works as designed) » Closed (fixed)

Derek-

Thanks for taking the time with this. I was able to correct this problem by reading up here: http://www.network-theory.co.uk/docs/cvsmanual/index.html and doing a merge between HEAD and DRUPAL-5.

Now that HEAD is up-to-date, I think I'm all set. The rest of the release instructions are very good.

- Ken

Component: CVS » Other