[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Mark E. Hamilton
Subject: Re: How to fix non-branch tag conflicts with branch name?
Date: Wed, 25 Jul 2007 16:44:46 -0600
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20060726 Red Hat/1.0.3-0.el4.1 SeaMonkey/1.0.3

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?

More details:
Both the branch name and the non-branch tag are existing tags in the project and are found to be not consistent across the entire project, probably, due to mistakes made during the branching process. The scenario could be that new files were added to an existing project and a non-branch tag was created accidentally.

What to do when one cannot easily give up the well-known branch and a non-branch tag is getting in the way (to create the desired branch name)?

If the CVS admin can easily fix this issue, it is a good solution.

The solution shouldn't be deleting the files because there were other active branches using the same source file.

Thanks for any advice.

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:

cvs tag -r non-branch-tag new-tag file    # create new tag
cvs tag -d non-branch-tag file            # remove old tab
cvs tag -b -r new-tag non-branch-tag file # create branch at new tag

Mark E. Hamilton
Orion International Technologies, Inc.
Sandia National Laboratory, NM.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]