Re: Cannot check in file after branch...?

[Flossie]

Jim.Hyslop wrote:
> Flossie wrote:
>
> > cvs commit: sticky tag `1.4' for file `test1.txt' is not a branch
> > cvs [commit aborted]: correct above errors first!
> > Error, CVS operation failed
>
> As the error message says, your file was checked out with a sticky tag: a
> revision tag, or a date, or a specific revision number (1.4 in this case).
> CVS cannot check in files that are checked out using a sticky tag.
ok, I need to better understand more about 'sticky tags'. I'm trying to 
be a dumb user here.
Do you know of a good web page along the lines of "CVS for dummies"?

> > I can't figure out how to get the file back into CVS. As far as I'm 
> > concerned, the file should happily be able to be updated in the main 
> > code tree (i.e ignoring the new branch), afterall this is 
> > where it was 
> > checked out from.
>
> You must have issued the command 'cvs update[or checkout] -r1.4' in order
> for it to have that sticky tag.
I'm using TortoiseCVS and did not see what command it issued (nor do I 
want to learn various command-line args for controlling CVS actions) - 
this is why I'm using a GUI :-)
All I did (before the branch) was start editing the file (which was 
already under CVS control) and save it. I'd tried this earlier and when 
I was done I could do a CVS commit. So in this situation the only 
difference was that a branch was created before I'd done the commit - a 
possibility in a larger project when many people are modifying many files.

> > How do I do this?
>
> You need to clear the sticky tag. If you want it on the branch, then update
> using a symbolic branch tag. If you want it on the head, then update using
> -A.
>
> Example:
>
> cvs update -r branch_tag
> cvs update -A
Thanks, will look into it