Deleting Branches
Hi. Just how does one delete a branch from the repository? (I created one by mistake and now I would like to remove it to keep the repository clean.) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Deleting Branches
On Mon, Mar 04, 2002 at 11:45:40AM -0800, Donald Gates wrote: Just how does one delete a branch from the repository? (I created one by mistake and now I would like to remove it to keep the repository clean.) If you haven't yet committed any revisions on the branch, you can just delete the branch tag itself, with cvs tag -d branch-tag. If you *have* committed revisions, you'll have to nuke those with cvs admin -o. Best to do this *before* deleting the branch tag, as you'll need the tag to help you find the revisions in question... -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Outlook not so good. That magic 8-ball knows everything! I'll ask about Exchange Server next. - Anonymous ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Deleting Branches
Donald Gates writes: Just how does one delete a branch from the repository? (I created one by mistake and now I would like to remove it to keep the repository clean.) As long as you haven't committed any revision on the branch, all you have is a tag; just delete it with tag -d. If you have committed revisions on the branch, you can delete them with admin -o, but be careful: it's tricky to get right and there's no way to undo it if you screw up. -Larry Jones Hey Doc, for 10 bucks I'll make sure you see those kids in the waiting room again real soon! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: deleting branches.
Nah. ISTR that admin -n will only work if it can latch on to something that already exists -Original Message- From: Donald Sharp [mailto:[EMAIL PROTECTED]] I just tried using the admin -n command in a test repository. I'm getting: NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. We cannot accept liability for any breaches of confidence arising through use of email. Any opinions expressed in this email (including attachments) are those of the author and do not necessarily reflect our opinions. We will not accept responsibility for any commitments made by our employees outside the scope of our business. We do not warrant the accuracy or completeness of such information. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
Donald Sharp wrote: I just tried using the admin -n command in a test repository. I'm getting: donsharp-u5:27 cvs admin -nFOOZLE:1.5.0.2 bar RCS file: /nfs/swtrf/repository/test/c/bar,v cvs [admin aborted]: revision `1.5.0.2' does not exist I know 1.5.0.2 doesn't exist, but that's the branch revision number... Actually, CVS still understands the original RCS file format, so you can attach the tag to rev 1.5.2 and everything should work properly. I'm not actually sure why both branch specification formats are supported by CVS. Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] CollabNet ( http://collab.net ) -- I will not sleep through my education. I will not sleep through my education. I will not sleep through my education... - Bart Simpson on chalkboard, _The Simpsons_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
deleting branches.
I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? donald ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: deleting branches.
Yes, if you can identify the a.b.0.c revision, but tread with care! Oh, and give the user a slap '-) Andy -Original Message- From: Donald Sharp [mailto:[EMAIL PROTECTED]] Sent: 31 May 2001 19:18 To: [EMAIL PROTECTED] Subject: deleting branches. I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? donald ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. We cannot accept liability for any breaches of confidence arising through use of email. Any opinions expressed in this email (including attachments) are those of the author and do not necessarily reflect our opinions. We will not accept responsibility for any commitments made by our employees outside the scope of our business. We do not warrant the accuracy or completeness of such information. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
As I suspected. I can identify the a.b.0.c revision. donald On Thu, May 31, 2001 at 07:57:26PM +0100, Andy Baker wrote: Yes, if you can identify the a.b.0.c revision, but tread with care! Oh, and give the user a slap '-) Andy -Original Message- From: Donald Sharp [mailto:[EMAIL PROTECTED]] Sent: 31 May 2001 19:18 To: [EMAIL PROTECTED] Subject: deleting branches. I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? donald ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. We cannot accept liability for any breaches of confidence arising through use of email. Any opinions expressed in this email (including attachments) are those of the author and do not necessarily reflect our opinions. We will not accept responsibility for any commitments made by our employees outside the scope of our business. We do not warrant the accuracy or completeness of such information. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
Donald Sharp writes: I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? Yep. Note that you'll have to use admin to do it -- tag -b will insist on creating a new branch, which isn't what you want. -Larry Jones I just can't identify with that kind of work ethic. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
I was just going to do it by hand( didn't realize that admin could do this ). I think I can do a cvs admin -nbranch_name:branch_rev filenames Where branch_name is the branch in question. Where branch_rev is the revision number for the branch. is this correct? donald On Thu, May 31, 2001 at 03:43:32PM -0400, Larry Jones wrote: Donald Sharp writes: I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? Yep. Note that you'll have to use admin to do it -- tag -b will insist on creating a new branch, which isn't what you want. -Larry Jones I just can't identify with that kind of work ethic. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
Donald Sharp writes: I was just going to do it by hand( didn't realize that admin could do this ). That's what I was afraid of. :-) I think I can do a cvs admin -nbranch_name:branch_rev filenames Where branch_name is the branch in question. Where branch_rev is the revision number for the branch. is this correct? I think so. But note that the branch_rev is likely to be different for each file, so be careful. (Some commands won't even let you specify a numeric revision with more than one file -- I don't remember whether admin is one of them or not.) -Larry Jones Archaeologists have the most mind-numbing job on the planet. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: deleting branches.
On Thu, May 31, 2001 at 03:59:15PM -0400, Larry Jones wrote: Donald Sharp writes: I was just going to do it by hand( didn't realize that admin could do this ). That's what I was afraid of. :-) Yep.. That's the reason I asked the question. Fortunately for me if I do it in this manner the user has only created this one branch after a import into the repository. So everthing looks identical.. I think I can do a cvs admin -nbranch_name:branch_rev filenames Where branch_name is the branch in question. Where branch_rev is the revision number for the branch. is this correct? I think so. But note that the branch_rev is likely to be different for each file, so be careful. (Some commands won't even let you specify a numeric revision with more than one file -- I don't remember whether admin is one of them or not.) I just tried using the admin -n command in a test repository. I'm getting: donsharp-u5:27 cvs admin -nFOOZLE:1.5.0.2 bar RCS file: /nfs/swtrf/repository/test/c/bar,v cvs [admin aborted]: revision `1.5.0.2' does not exist I know 1.5.0.2 doesn't exist, but that's the branch revision number... Thoughts? donald -Larry Jones Archaeologists have the most mind-numbing job on the planet. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
deleting branches
Donald Sharp wrote: I have a user who manged to delete a branch( it looks like with the cvs rtag -d command ). When I went poking at the ,v file it looks like the revisions for that branch are still around. Is it ok to just put the branch name and revision back into the ,v files? Yes, I think so, but you have to use the magic branch revision,(with a zero in it in the next to last part of the rev number.) This can be a little tricky to figure out, conceivably impossible in some cases). There was a thread some time ago on recovering a lost branch tag. In the general case, it is not possible, though in specific cases (possibly most cases?) it can be done. If you have a revision a.b.c.d, the branch revision could be a.b.0.c, but, if the file has not been changed on that branch, it would be something else, and that's where the trouble comes from. (I think I got that right...) See: http://groups.google.com/groups?hl=enlr=safe=offic=1th=9c603ed65ed2e6a4,11seekm=fa.olakjtv.dhsqp9%40ifi.uio.no#p (go to groups.google.com and search for Deleted Branch Tag if you don't want to type in that URL.) If you created a non-branch tag initially when the branch was created to mark the origin, you are in better shape than if you didn't. (This would be an argument _against_ my .origin patch http://www.geocities.com/dotslashstar/branch_patch.html) However, you cannot just do cvs rtag -b -r my_branch_origin_tag lost_branch_tag everything It might make sense to change CVS so that it balks at deleting a branch tag unless you give it some option to let it know that you know that you're deleting a branch tag, so that you don't inadvertently do so when you mean only to delete a regular tag. I say this because there is almost never a sane reason to delete a branch tag. Even if you create one by mistake, what harm is there in leaving it lying around? And if there are revisions on the branch, then deleting the branch tag is almost certainly the wrong thing to do, and can be catastrophic. For the case where you have a tag which is non-branch in some files, and a branch tag in others, skip deleting the branch tags...(with warnings about skipping and about the fact that the same tag shows up sometimes as branch sometimes as non-branch.) Or are there people out there happily deleting branch tags willy-nilly as part of normal every day operations? -- steve __ Do You Yahoo!? Get personalized email addresses from Yahoo! Mail - only $35 a year! http://personal.mail.yahoo.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
