Re: branching

[Daniel Berlin <dberlin@dberlin.org>]

On Thu, 19 Sep 2002, Keith Seitz wrote:

> On Thu, 19 Sep 2002, Kevin Buettner wrote:
> 
> > Do you create a new tag for each merge?
> 
> Yes:
>         kseitz_interps-20020829-merge   (revision: 1.69)
>         kseitz_interps-20020809-merge   (revision: 1.66)
>         kseitz_interps-20020722-merge   (revision: 1.65)
>         kseitz_interps-20020619-merge   (revision: 1.61)
>         kseitz_interps-20020528-branch  (branch: 1.59.4)
>         kseitz_interps-20020528-branchpoint     (revision: 1.59)
> 
> > Do you remove old tags that are no longer useful?
> 
> Can this be done? I've never heard of anyone removing a tag. Hmm, indeed:
> 
> $ cvs rtag --help
> [snip]
>         -d      Delete the given tag.
> [snip]
> 
> Wow. I guess I should get rid of the older tags (or use the -F option to 
> move a tag).

In fact, if you really want to be advanced, and not deal with the 
slowdown on merged files that haven't been modified by you on the branch, 
but have been on the merge (This is hard to explain. If you merge from 
the head, and commit the result, it makes a new revision in the file, 
even if you haven't made changes on the branch. This eventually makes 
accessing the branch *quite* slow), you can just move the branch tags on 
the files you haven't modified on the branch, so that they refer to the 
new mainline revision.

Sounds more difficult complex than it is.

> > 
Keith > > 
>