RE: Renaming a branch
David Leskovac writes: Okay. So, just to be clear, this is actually a 3-step process: 1. Checkout branch: cvs co -r branchname module 2. Rename from sandbox: cd to root of module in sandbox cvs admin -n newname:oldname 3. Delete original tag name sandbox: cd to root of module in sandbox cvs tag -d oldname Correct? Correct. I strongly encourage you to verify that step 2 has worked correctly before you move on to step 3, though. :-) Thanks to all for the responses on this. Last question(s): If the cvs admin -n command renames branches why the need to delete the original branch name? What happens if you don't delete the original name? -Dave ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
David Leskovac writes: If the cvs admin -n command renames branches why the need to delete the original branch name? What happens if you don't delete the original name? admin -n doesn't rename the branch, it just creates a new name for it. If you don't delete the old name, you can use either name to refer to the branch. There's nothing wrong with that, but it might be confusing. -Larry Jones It's like SOMEthing... I just can't think of it. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
David Leskovac writes: Would this work for each branch to be renamed?: cvs rtag -b -r original_branch_name new_branch_name module No, that creates a new branch off of the existing branch rather than renaming the existing branch. You need to use admin -n instead. -Larry Jones Kicking dust is the only part of this game we really like. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Renaming a branch
You still need a 2-step process, you just use admin -n to create a new name for the existing branch rather than using tag -b to create a new branch: cvs admin -n newname:oldname cvs tag -d oldname (Note that there's no radmin command so you need to have a checked out working directory.) Okay. So, just to be clear, this is actually a 3-step process: 1. Checkout branch: cvs co -r branchname module 2. Rename from sandbox: cd to root of module in sandbox cvs admin -n newname:oldname 3. Delete original tag name sandbox: cd to root of module in sandbox cvs tag -d oldname Correct? -Dave ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Renaming a branch
Would this work for each branch to be renamed?: cvs rtag -b -r original_branch_name new_branch_name module No, that creates a new branch off of the existing branch rather than renaming the existing branch. You need to use admin -n instead. Okay. So rather than the 2-step process I mentioned in my original post where I would create a new branch from the original branch then delete the original branch, there is a way to simply rename the existing branch with a cvs admin -n command? I looked at the syntax of cvs admin but it is not clear to me how this can be achieved. Would someone please provide an example? Thanks, -Dave ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
David Leskovac writes: Okay. So rather than the 2-step process I mentioned in my original post where I would create a new branch from the original branch then delete the original branch, there is a way to simply rename the existing branch with a cvs admin -n command? I looked at the syntax of cvs admin but it is not clear to me how this can be achieved. Would someone please provide an example? You still need a 2-step process, you just use admin -n to create a new name for the existing branch rather than using tag -b to create a new branch: cvs admin -n newname:oldname cvs tag -d oldname (Note that there's no radmin command so you need to have a checked out working directory.) -Larry Jones Hmm... That might not be politic. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
David Leskovac wrote: Sorry for the basic question but I need to implement a new branch naming scheme want to make sure I am doing this correctly. To start this process, I need to rename several existing branches. Would this work for each branch to be renamed?: cvs rtag -b -r original_branch_name new_branch_name module cvs rtag -d original_branch_name I am aware of the -B argument to rtag. But, the version of cvs that we use is so old (1.11.1p1) that it pre-dates that argument. That will probably get you where you want to be, although it doesn't really do what your stated goal is (to rename the branch). It will create a new branch and delete the old branch. The effect will be the same, but be aware that you will be branching off a branch. Suppose, for example, that the tip revision for a particular file on original_branch_name is 1.2.2.2: Before branch add and delete: 1.1 --- 1.2 --- ... \ + --- 1.2.2.1 --- 1.2.2.2 after branch add and delete: 1.1---1.2--- ... \ +---1.2.2.1---1.2.2.2---X --old branch (effectively dead) \ + ---1.2.2.2.2.1 -- new branch 'cvs co -r new_branch_name' will retrieve the correct branch. -- Jim ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
David Leskovac writes: Okay. So, just to be clear, this is actually a 3-step process: 1. Checkout branch: cvs co -r branchname module 2. Rename from sandbox: cd to root of module in sandbox cvs admin -n newname:oldname 3. Delete original tag name sandbox: cd to root of module in sandbox cvs tag -d oldname Correct? Correct. I strongly encourage you to verify that step 2 has worked correctly before you move on to step 3, though. :-) -Larry Jones There's a connection here, I just know it. -- Calvin ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
Could one use: cvs rtag -r oldname newname . Larry Jones [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] Yes, use cvs admin -n to create the new tag pointing to the same... ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
Dennis W. Bulgrien writes: Could one use: cvs rtag -r oldname newname . No. That will create a revision tag pointing to the most recent revision on the branch rather than creating a new name for the branch itself. Likewise, adding a -b to create branch tag rather than a revision tag will create a new branch rooted at the tip of the existing branch rather than creating a new name for the existing branch. -Larry Jones Start tying the sheets together. We'll go out the window. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Renaming a branch
Is it possible to rename a branch? The manual says that it is possible to rename a tag but not a branch tag. Is there any way around this? NOTE: I am well aware that this is a dangerous procedure and do not think it is a good idea, but I have been asked to research it anyway. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: renaming a branch?
You can create a synonym of a branch using: cvs admin -nNEWBRANCH:OLDBRANCH and then you can remove OLDBRANCH. -- Strong suggestion is to back up your repository, I've only tested this - I've never used it in anger. There's no rolling back from mistakes. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Keith Hearn Sent: Friday, October 19, 2001 6:13 PM To: '[EMAIL PROTECTED]' Subject: renaming a branch? Is there a decent way to rename a branch? We'd like to have our branches named BR_version, such as BR_1_0 for maintenance of the 1.0 release, BR_1_1 for the 1.1 release, etc. Unfortunately, we created a BR_1_0 branch a while back, and later decided it was too early for making the branch so we merged everything from it back into the trunk. The branch is still there, it's just an unused dead end (like an abandoned railroad spur going off into the weeds...). We're now approaching the point when we really should create a branch for the 1.0 release. I'd really like to use BR_1_0 as the branch tag, but I don't think I can if there is already a branch with that name. I suspect that I can do something like using find and sed to change every occurrence of BR_1_0 in the repository to old_1_0, but I'm wondering if someone knows a better way? If not, would it work to just do the above find/sed hack? Thanks for any help you can offer, Keith Hearn ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
renaming a branch?
Is there a decent way to rename a branch? We'd like to have our branches named BR_version, such as BR_1_0 for maintenance of the 1.0 release, BR_1_1 for the 1.1 release, etc. Unfortunately, we created a BR_1_0 branch a while back, and later decided it was too early for making the branch so we merged everything from it back into the trunk. The branch is still there, it's just an unused dead end (like an abandoned railroad spur going off into the weeds...). We're now approaching the point when we really should create a branch for the 1.0 release. I'd really like to use BR_1_0 as the branch tag, but I don't think I can if there is already a branch with that name. I suspect that I can do something like using find and sed to change every occurrence of BR_1_0 in the repository to old_1_0, but I'm wondering if someone knows a better way? If not, would it work to just do the above find/sed hack? Thanks for any help you can offer, Keith Hearn ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re[2]: Renaming a branch
Hello Karl-Heinz,
Monday, June 25, 2001, 1:25:52 PM, you wrote:
KHM Hi Boris,
KHM i assumbe you mean rename the branch tag?
Yes, that was my problem. I had created a branch with a name, people
checked out and later the branch name was not the right name for the
end result of this branch.
KHM cvs rtag -r old-name-0-4 rel-0-4 tc
KHM cvs rtag -d old-name-0-4 tc
Thanks.
--
Boris Köster [MCSE, CNA]
void SurfTo ( http://www.x-itec.de ){ thanks(0);exit(0); }
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
Hi Boris, i assumbe you mean rename the branch tag? cut from the Cederquvist...: When we say rename a tag, we mean to make a different name point to the same revisions as the old tag. For example, one may have misspelled the tag name and want to correct it (hopefully before others are relying on the old spelling). To rename a tag, first create a new tag using the `-r' option to `cvs rtag', and then delete the old name. This leaves the new tag on exactly the same files as the old tag. For example: cvs rtag -r old-name-0-4 rel-0-4 tc cvs rtag -d old-name-0-4 tc Kind regards. -- Dipl.-Ing. Karl Heinz Marbaise | Phone: +49 (241) 4 13 26 - 48 QIS Systemhaus GmbH Aachen | Fax : +49 (241) 4 13 26 - 40 Juelicher Strasse 338 | Internet: http://www.qis-systemhaus.de 52070 Aachen | e-mail : [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Renaming a branch
Like an idiot I came up with a branch name that is not only too long and unwieldy, but it no longer accurately reflects it's contents. Is there a good way to rename a branch? The only option I can think of is to create a new branch, populate it with my trunk at time t0, then merge in my crappy name, test, swear, test some more, then delete the original branch. Is there a better way (like an awk script to frob all the ,v files in my Repository?) I don't want to merge my branch to the trunk, the trunk is a set of vendor code that gets modified for various projects. jim ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Renaming a branch
Jim Harkins [EMAIL PROTECTED] writes: Like an idiot I came up with a branch name that is not only too long and unwieldy, but it no longer accurately reflects it's contents. Is there a good way to rename a branch? As long as you can prevent other people from accessing the repository while the script is running, you can just run an awk (perl, whatever you're most comfortable) script that searches for the old branchname in the ,v files and replaces it with the new branch name. To prevent changing lines in the actual source that may coincidentally contain the same name, only do it between the first line that matches ^symbols and the first line that matches ^locks (I'm basing this on a quick look at a ,v file). The only option I can think of is to create a new branch, populate it with my trunk at time t0, then merge in my crappy name, test, swear, test some more, then delete the original branch. Is there a better way (like an awk script to frob all the ,v files in my Repository?) I don't want to merge my branch to the trunk, the trunk is a set of vendor code that gets modified for various projects. jim ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
renaming a branch
Hi all, even if the subject looks like a FAQ, it is not. I mean I searched Deja-news for that, and the suggested solutions I found don't work. Cederqvist manual didn't help me. Please, can anybody help me? Thank you in advance, Mirko Venturi c/o Qubica S.r.l., via dell'Arcoveggio 80, I-40129 Bologna, Italia mailto:[EMAIL PROTECTED] Tel.: +39-051-6388135, fax: +39-051-321434 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
