Re: Committing on a previously tagged version with WinCVS

[Mark D. Baushke]

address@hidden writes:

> Hi all,
> during the development of a module I needed to go back to a previous
> version that was tagged as LADDER_WIN2000_0_2. The CVS version was 1.7.
> So I committed the version I was working on, that became the 1.8.
> Then I retrived the previouslytagged  version using the update command with
> the Retrieve rev/tag/branch option selected to the name of the tagged
> version (LADDER_WIN2000_0_2).
> I modified the tagged version (1.7) and now I want to commit it. 

Create a branch now.

       cvs tag -b bug-fix-branch-name-of-your-choice
       cvs up -r bug-fix-branch-name-of-your-choice

now you will be able to commit your fix to the newly created branch.

> If I try
> to commit I get the following error message:
> 
> cvs commit -m "- Aggiunta funzione ReadNewBytes.\n- Modificata funzione
> Caratteri_Ricevuti e Wai..." -r LADDER_WIN2000_0_2 circbuf.c (in directory
> F:\Projects\include\)
> cvs commit: sticky tag `LADDER_WIN2000_0_2' for file `circbuf.c' is not a
> branch
> cvs [commit aborted]: correct above errors first!
> 
> ***** CVS exited normally with code 1 *****
> 
> I understand that I can't commit a 1.7 version to a 1.8, because 1.8
> already exist. I think I should branch and tag before updating to and an
> older version. But now is not possible.

You want to branch from the existing tag, update your tree to point to
that new branch, commit to that new branch, verify that everything works,
create your new version and then tag it with a version tag.

> What should I do now to discard the 1.8 version and keep working (and
> committing) on the tagged version ?

Do not discard version 1.8 of the file.
 
> Tank you in advance.
> 
> Alberto Giordano

        -- Mark