Re: partial branch problem

[Jon Ringle]

On Friday 30 January 2004 09:45 am, Jim.Hyslop wrote:
> Jon Ringle [mailto:address@hidden wrote:
> > After doing my first branch based on a tag created by a build
> > script, I
> > discovered that the build script creates the tag on a
> > subdirectory of the
> > module rather than on the module itself using something like:
> >
> > cvs tag -R sometag module/sub1
>
> [...]
>
> > However, there are other subdirectories of the module that
> > need to be a part
> > of the branch. Fortunately, the other subdirectories are
> > tracking 3rd party
> > sources that change very infrequently.
> >
> > I was thinking that I might be able to correct the situation by doing:
> >
> > cvs tag -R sometag module/sub2
> > cvs rtag -b -r sometag branch_sometag module/sub2
>
> [...]
>
> > Is there another approach that would be better? (I do plan on
> > fixing the build
> > script that created this problem in the first place)
>
> If the whole module needs the tag, then just issue the tag command at the
> root directory for the module:
>
> cvs rtag -R sometag branch_sometag module

The above complained that branch_sometag is not a module

>
> When CVS processes sub1, it will complain about the existing tags, saying
> something like "tag branch_sometag exists, not moving it". You can ignore
> these complaints. CVS won't move the tags, unless you use the -F flag
> (which, from the sounds of it, you don't want to do).

This seems to work though:

cvs rtag sometag module
cvs rtag -b -r sometag branch_sometag module