No, the STRUTS_1_0_1 wasn't there before - the rtag command created a new branch. I need to figure out how to undo it, since I'll need to label (but not branch) the Struts 1.0 branch for the 1.0.1 release tomorrow. In the meantime, it might be better if you don't commit anything to the branch you created - it might make it simpler to undo.
You should be checking your changes into the STRUTS_1_0_BRANCH. You can get that by doing 'cvs checkout -r STRUTS_1_0_BRANCH jakarta-struts'. Have you checked in any changes today? I haven't seen any checkin messages. Perhaps you're having the same problem as I am with commit messages being flagged for moderation. -- Martin Cooper ----- Original Message ----- From: SCHACHTER,MICHAEL (HP-NewJersey,ex2) <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Tuesday, November 20, 2001 9:33 PM Subject: RE: i think i screwed up cvs... > > I'm a bit confused now... Was the STRUTS_1_0_1 branch put in > recently and I just thought I put it there? Did I actually > do anything? And if I didn't, I just committed multipart > changes to STRUTS_1_0_BRANCH, should I now re-commit them to the > STRUTS_1_0_1 branch? Am I just going crazy? Sorry for any > potential confusion/trouble I've caused. > > -----Original Message----- > From: SCHACHTER,MICHAEL (HP-NewJersey,ex2) > Sent: Tuesday, November 20, 2001 11:57 PM > To: '[EMAIL PROTECTED]' > Subject: i think i screwed up cvs... > > > Hey, > > I did a > "cvs rtag -b -r STRUTS_1_0 STRUTS_1_0_1 jakarta-struts", thinking > it would create a local copy of STRUTS_1_0_1 stuff on my > machine and I created another branch on the CVS repository > called STRUTS_1_0_1... is there a way to get rid of that > branch, base it off of STRUTS_1_0_BRANCH instead, or something > else to un-screwup cvs? > > -- > To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> > For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> > -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
