rearranging branches

I have a branch that is on a number of files. Some of these
files have
different tags. I realize know that instead of a single
branch I should
have created a branch for each of the tags. Is there a
simple way <g> to
recreate the branches I really wanted and possibly get rid
of the single
branch I don't?
Example:

File1
   1.1 	   : BaseBranch 
   1.1.1.2 : GoodTag1

File2
   1.1 :     BaseBranch 
   1.1.1.3 : GoodTag2

What I'd like to do is change BaseBranch on any file that
has a revsion
with GoodTag1 to GoodBranch1 and for any file with a
revision GoodTag2 I
want to change BaseBranch to GoodBranch2.
So it would look like this:

File1
   1.1 	   : GoodBranch1
   1.1.1.2 : GoodTag1

File2
   1.1 :     GoodBranch2
   1.1.1.3 : GoodTag2


I can live with BaseBranch existing afterward and just
ignoreing it. I'd
prefer for BaseBranch to go away or be replaced by the
separate
GoodBranches.

TIA,
Rick
   
_______________________________________________
cvsnt mailing list
cvsntcvsnt.org
h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

Rick Martin wrote:
> I have a branch that is on a number of files. Some of
these files have
> different tags. I realize know that instead of a single
branch I should
> have created a branch for each of the tags. Is there a
simple way <g> to
> recreate the branches I really wanted and possibly get
rid of the single
> branch I don't?

Z:>cvs -H tag
Usage: cvs tag [-bcdFflR] [-r rev|-D date] tag [files...]
         -A      Make alias of existing branch (requires
-r).
...

Use the alias feature to name it like you wanted to.

Then I *think* you might be able to delete the original tag
... not sure 
on that though, TEST FIRST!!


-- 
Glen Starrett
Technical Account Manager, North America
March Hare Software, LLC

http://march-hare.com/c
vspro/
_______________________________________________
cvsnt mailing list
cvsntcvsnt.org
h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

On Fri, 16 Mar 2007 16:35:22 -0700, Rick Martin wrote:

>> 
>> Z:>cvs -H tag
>> Usage: cvs tag [-bcdFflR] [-r rev|-D date] tag
[files...]
>>          -A      Make alias of existing branch
(requires -r).
>> ...
>> 
>> Use the alias feature to name it like you wanted
to.
>> 
>> Then I *think* you might be able to delete the
original tag ... not sure 
>> on that though, TEST FIRST!!
> 
> Thanks, Glen.
> 
> I didn't really understand what an Alias tag was. I'll
test it out and
> report back.
> 
> Rick

Hi Glen,

Thanks a lot for pointing the Alias branch out to me. It let
me do what I
needed pretty easily.  
In case anyone else runs into the need to rename a branch
here is what I
did.

First I updated the module to the old branch.
cvs update -P -t -d -r Old_Branch
Then I created a new branch based on the old branch.
cvs tag -A -r Old_Branch New_Branch
Finally, (after checking and testing everything) I deleted
the old branch.
cvs tag -d -B Old_Branch

Looking at a graph of one of the files in the branch shows
the New_Branch
with all of the revision previously associated with
Old_Branch.

Hopefully, this will help someone else.

Rick
_______________________________________________
cvsnt mailing list
cvsntcvsnt.org
h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

>From my experience, the 'alias' flag should well be
named 'clone'; IOW
in all CVSNT versions I've ever used, yes you can remove the
old
branch after doing 'tag -A'.

But you'd better use the 'rtag' command instead so that 'cvs
removed'
files in the repository don't keep the old branch tag and
you don't
need to mess with your sandbox.

cvs rtag -A -r Old_Branch New_Branch Module
(Now you could update your sandbox to the new branch to
assure it's working)
cvs rtag -d -B Old_Branch Module

Best regards,
Flávio


On 3/19/07, Rick Martin <rsmandcam_no_spam_sbcglobal.net>
wrote:
> On Fri, 16 Mar 2007 16:35:22 -0700, Rick Martin wrote:
>
> >>
> >> Z:>cvs -H tag
> >> Usage: cvs tag [-bcdFflR] [-r rev|-D date] tag
[files...]
> >>          -A      Make alias of existing branch
(requires -r).
> >> ...
> >>
> >> Use the alias feature to name it like you
wanted to.
> >>
> >> Then I *think* you might be able to delete the
original tag ... not sure
> >> on that though, TEST FIRST!!
> >
> > Thanks, Glen.
> >
> > I didn't really understand what an Alias tag was.
I'll test it out and
> > report back.
> >
> > Rick
>
> Hi Glen,
>
> Thanks a lot for pointing the Alias branch out to me.
It let me do what I
> needed pretty easily.
> In case anyone else runs into the need to rename a
branch here is what I
> did.
>
> First I updated the module to the old branch.
> cvs update -P -t -d -r Old_Branch
> Then I created a new branch based on the old branch.
> cvs tag -A -r Old_Branch New_Branch
> Finally, (after checking and testing everything) I
deleted the old branch.
> cvs tag -d -B Old_Branch
>
> Looking at a graph of one of the files in the branch
shows the New_Branch
> with all of the revision previously associated with
Old_Branch.
>
> Hopefully, this will help someone else.
>
> Rick
> _______________________________________________
> cvsnt mailing list
> cvsntcvsnt.org
> h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>
_______________________________________________
cvsnt mailing list
cvsntcvsnt.org
h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

On Mon, 19 Mar 2007 21:56:29 -0300, Flávio Etrusco wrote:

> From my experience, the 'alias' flag should well be
named 'clone'; IOW
> in all CVSNT versions I've ever used, yes you can
remove the old
> branch after doing 'tag -A'.
> 
> But you'd better use the 'rtag' command instead so that
'cvs removed'
> files in the repository don't keep the old branch tag
and you don't
> need to mess with your sandbox.
> 
> cvs rtag -A -r Old_Branch New_Branch Module
> (Now you could update your sandbox to the new branch to
assure it's working)
> cvs rtag -d -B Old_Branch Module
> 

Thanks, Flávio.

In this case I needed to run the tag operations on the local
sandbox.
There were many files that had the old branch name. In each
case I wanted
to take a subset of those files and give them a new branch
name in place of
the old one and then get rid of the old one.
By updating my local sandbox to the subset of files and
using tag instead
of rtag it let me do this.

Rick
_______________________________________________
cvsnt mailing list
cvsntcvsnt.org
h
ttp://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt