Re: How to fix non-branch tag conflicts with branch name?

[Daniel Yek]

Mark E. Hamilton wrote:
> Daniel Yek wrote:
> > If a non-branch tag is found in some source directory/module to be 
> > the same as a branch name, can the non-branch tag be removed and 
> > replaced with the branch with the same name? If so, how?
> Add a new tag at the non-branch tag on the file, remove the non-branch 
> tag from the file, and create a branch of the file at the new tag:

That worked wonderfully! It doesn't even require the CVS admin to 
muck-around in the CVS store (as I thought it might require!)

cd targetdir
cvs rtag -r branchname branchname_old .        # "Rename" existing tag
cvs tag -d branchname                          # "Rename" existing tag
cvs rtag -b -r branchname_old branchname .     # Create the desired 
branch name


Thank you much!

--
Daniel Yek.

dyek.vcf
Description: Vcard