problem with branching/tagging (gravatar module)

Hi,

I am having severe problems with CVS. I read through all nodes (at drupal.org) concerning CVS and consulted "the cederqvist" more than once, but I still do not completely understand what the problem is. And I most definately do not want to mess around any more ...

So far I managed to create a DRUPAL-6--1 branch and commit changes to it. I am certain to work in this branch only, but if I want to tag the files in branch I get these messages, see below:

$ cvs tag DRUPAL-6--1-0

cvs tag: Tagging .
W README.txt : DRUPAL-6--1-0 already exists on version 1.1 : NOT MOVING tag to version 1.1.2.1
W gravatar.info : DRUPAL-6--1-0 already exists on version 1.1 : NOT MOVING tag to version 1.1.2.2
W gravatar.module : DRUPAL-6--1-0 already exists on version 1.6 : NOT MOVING tag to version 1.6.2.2

these three files are in the MAIN-branch in HEAD also, and for some reason are tagged DRUPAL-6--1-0.

If what has happened is (even if only partially) related to "Resolving a 'sticky tag is not a branch' error" or "Resolving a 'sticky tag is not a valid branch in this CVS repository' error", please advise.
The url to the intended release is: http://drupal.org/node/233441

Could you please help me out. Preferably, I'd like to revert everything in MAIN / HEAD to the state it was before I was trying to create the DRUPAL-6--1 branch, so its possible to start a new.

How might it be possible to then "clean" the DRUPAL-6--1 branch (aka start a new), add and commit the new files intended for this branch only, and then tag them correctly ?

Thanks,
Matthias