Re: CVS branching
Shapira, Yoav wrote: Hi, So at some point soon (the next day or two), we want to put the current tomcat 5 code on a branch called tomcat_5_0 (the actual branch name is tentative but let's use tomcat_5_0 for example). We'll do this after tagging TOMCAT_5_0_26 on the main branch. The actual CVS command is easy: cvs rtag -r TOMCAT_5_0_26 -b TOMCAT_5_0 (repeat once for each tomcat CVS module, jakarta-tomcat-5, jakarta-tomcat-catalina, etc.) Subsequent checkouts and tagging operations against this have to specify -r TOMCAT_5_0 or else they work against the default, main/head branch. Commits are easy (don't need a branch specified) as they automatically work against the branch where the checkout was done. Is that it? Should we be concerned about the fact that the main/head codebase will not be as stable, so users trying to build head (or automated/nightly/gump trying to build head) may run into trouble? Yes (but I recommend putting a new 5.0.27 tag when branching, wven if we don't bother doing a proper release). No (HEAD is supposed to mean trouble, right ;) ). For now, I think a branch is only needed in jakarta-tomcat-catalina (if there are problems, I'll use a build2.xml in jakarta-tomcat-5 with temporary hacks). Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: CVS branching
Hi, For now, I think a branch is only needed in jakarta-tomcat-catalina (if there are problems, I'll use a build2.xml in jakarta-tomcat-5 with temporary hacks). Would it be better if you did your refactoring in a branch and then merged into the main branch, overwriting as needed, when you're ready? The advantages would include an easier time for me when doing releases, and other people being able to build from HEAD (hopefully ;)). Yoav This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
I assume next release from HEAD will be labeled 5.1 ? If you plan changes big enough to require a branch, probably a 5.0 - 5.1 is also needed. Costin Shapira, Yoav wrote: Hi, So at some point soon (the next day or two), we want to put the current tomcat 5 code on a branch called tomcat_5_0 (the actual branch name is tentative but let's use tomcat_5_0 for example). We'll do this after tagging TOMCAT_5_0_26 on the main branch. The actual CVS command is easy: cvs rtag -r TOMCAT_5_0_26 -b TOMCAT_5_0 (repeat once for each tomcat CVS module, jakarta-tomcat-5, jakarta-tomcat-catalina, etc.) Subsequent checkouts and tagging operations against this have to specify -r TOMCAT_5_0 or else they work against the default, main/head branch. Commits are easy (don't need a branch specified) as they automatically work against the branch where the checkout was done. Is that it? Should we be concerned about the fact that the main/head codebase will not be as stable, so users trying to build head (or automated/nightly/gump trying to build head) may run into trouble? Yoav Shapira Millennium Research Informatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
Shapira, Yoav wrote: Hi, For now, I think a branch is only needed in jakarta-tomcat-catalina (if there are problems, I'll use a build2.xml in jakarta-tomcat-5 with temporary hacks). Would it be better if you did your refactoring in a branch and then merged into the main branch, overwriting as needed, when you're ready? The advantages would include an easier time for me when doing releases, and other people being able to build from HEAD (hopefully ;)). That's not how we do it, usually. HEAD remains the dev branch, while the stable releases are made from a branch. Working from a branch is not very different as working from HEAD, so I don't think you would run into trouble. But at least for now, I can create a Remy_Branch and hack. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
I'm planning to refator some and add a bunch of work into HEAD since this where we do dev, I suggest we go with remy's suggestion, to branch off 5.0.x and continue new dev into HEAD Filip - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, June 02, 2004 12:14 PM Subject: Re: CVS branching Shapira, Yoav wrote: Hi, For now, I think a branch is only needed in jakarta-tomcat-catalina (if there are problems, I'll use a build2.xml in jakarta-tomcat-5 with temporary hacks). Would it be better if you did your refactoring in a branch and then merged into the main branch, overwriting as needed, when you're ready? The advantages would include an easier time for me when doing releases, and other people being able to build from HEAD (hopefully ;)). That's not how we do it, usually. HEAD remains the dev branch, while the stable releases are made from a branch. Working from a branch is not very different as working from HEAD, so I don't think you would run into trouble. But at least for now, I can create a Remy_Branch and hack. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: CVS branching
Hi, OK, if we already have an established practice to continue development on HEAD, that's OK. I'll branch TOMCAT_5_0 when I tag 5.0.27 then. Yoav Shapira Millennium Research Informatics -Original Message- From: Filip Hanik - Dev [mailto:[EMAIL PROTECTED] Sent: Wednesday, June 02, 2004 1:19 PM To: Tomcat Developers List Subject: Re: CVS branching I'm planning to refator some and add a bunch of work into HEAD since this where we do dev, I suggest we go with remy's suggestion, to branch off 5.0.x and continue new dev into HEAD Filip - Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, June 02, 2004 12:14 PM Subject: Re: CVS branching Shapira, Yoav wrote: Hi, For now, I think a branch is only needed in jakarta-tomcat-catalina (if there are problems, I'll use a build2.xml in jakarta-tomcat-5 with temporary hacks). Would it be better if you did your refactoring in a branch and then merged into the main branch, overwriting as needed, when you're ready? The advantages would include an easier time for me when doing releases, and other people being able to build from HEAD (hopefully ;)). That's not how we do it, usually. HEAD remains the dev branch, while the stable releases are made from a branch. Working from a branch is not very different as working from HEAD, so I don't think you would run into trouble. But at least for now, I can create a Remy_Branch and hack. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
Shapira, Yoav wrote: Hi, OK, if we already have an established practice to continue development on HEAD, that's OK. I'll branch TOMCAT_5_0 when I tag 5.0.27 then. Wouldn't you branch it now prior to any non-5.0 work being done on HEAD? -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: CVS branching
Hi, I don't know, depends on Remy and when he wants to start working on dangerous stuff ;) In fact, Remy can tag the branch when he feels like it's necessary, and just notify everyone before and after he's done it. Yoav Shapira Millennium Research Informatics -Original Message- From: Jess Holle [mailto:[EMAIL PROTECTED] Sent: Wednesday, June 02, 2004 1:45 PM To: Tomcat Developers List Subject: Re: CVS branching Shapira, Yoav wrote: Hi, OK, if we already have an established practice to continue development on HEAD, that's OK. I'll branch TOMCAT_5_0 when I tag 5.0.27 then. Wouldn't you branch it now prior to any non-5.0 work being done on HEAD? -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
Wouldn't you branch it now prior to any non-5.0 work being done on HEAD? yes - Original Message - From: Jess Holle [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, June 02, 2004 12:45 PM Subject: Re: CVS branching Shapira, Yoav wrote: Hi, OK, if we already have an established practice to continue development on HEAD, that's OK. I'll branch TOMCAT_5_0 when I tag 5.0.27 then. -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
CVS branching
Hi, So at some point soon (the next day or two), we want to put the current tomcat 5 code on a branch called tomcat_5_0 (the actual branch name is tentative but let's use tomcat_5_0 for example). We'll do this after tagging TOMCAT_5_0_26 on the main branch. The actual CVS command is easy: cvs rtag -r TOMCAT_5_0_26 -b TOMCAT_5_0 (repeat once for each tomcat CVS module, jakarta-tomcat-5, jakarta-tomcat-catalina, etc.) Subsequent checkouts and tagging operations against this have to specify -r TOMCAT_5_0 or else they work against the default, main/head branch. Commits are easy (don't need a branch specified) as they automatically work against the branch where the checkout was done. Is that it? Should we be concerned about the fact that the main/head codebase will not be as stable, so users trying to build head (or automated/nightly/gump trying to build head) may run into trouble? Yoav Shapira Millennium Research Informatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: CVS branching
Since Gump(y) hasn't built for months, it can't complain more than it already is doing ;-). The real question is whether we want to run Gump on the 5.0 branch as well as HEAD. - Original Message - From: Shapira, Yoav [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Tuesday, June 01, 2004 6:00 AM Subject: CVS branching Hi, So at some point soon (the next day or two), we want to put the current tomcat 5 code on a branch called tomcat_5_0 (the actual branch name is tentative but let's use tomcat_5_0 for example). We'll do this after tagging TOMCAT_5_0_26 on the main branch. The actual CVS command is easy: cvs rtag -r TOMCAT_5_0_26 -b TOMCAT_5_0 (repeat once for each tomcat CVS module, jakarta-tomcat-5, jakarta-tomcat-catalina, etc.) Subsequent checkouts and tagging operations against this have to specify -r TOMCAT_5_0 or else they work against the default, main/head branch. Commits are easy (don't need a branch specified) as they automatically work against the branch where the checkout was done. Is that it? Should we be concerned about the fact that the main/head codebase will not be as stable, so users trying to build head (or automated/nightly/gump trying to build head) may run into trouble? Yoav Shapira Millennium Research Informatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: CVS branching
Hi, I'd like to get Gump to build. It seems like it's getting the wrong struts version (1.0.2 instead of 1.1), thereby causing compile errors for the admin webapp? Anyways, let's not continue that discussion in this thread. Yoav Shapira Millennium Research Informatics -Original Message- From: Bill Barker [mailto:[EMAIL PROTECTED] Sent: Tuesday, June 01, 2004 1:35 PM To: Tomcat Developers List Subject: Re: CVS branching Since Gump(y) hasn't built for months, it can't complain more than it already is doing ;-). The real question is whether we want to run Gump on the 5.0 branch as well as HEAD. - Original Message - From: Shapira, Yoav [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Tuesday, June 01, 2004 6:00 AM Subject: CVS branching Hi, So at some point soon (the next day or two), we want to put the current tomcat 5 code on a branch called tomcat_5_0 (the actual branch name is tentative but let's use tomcat_5_0 for example). We'll do this after tagging TOMCAT_5_0_26 on the main branch. The actual CVS command is easy: cvs rtag -r TOMCAT_5_0_26 -b TOMCAT_5_0 (repeat once for each tomcat CVS module, jakarta-tomcat-5, jakarta-tomcat-catalina, etc.) Subsequent checkouts and tagging operations against this have to specify -r TOMCAT_5_0 or else they work against the default, main/head branch. Commits are easy (don't need a branch specified) as they automatically work against the branch where the checkout was done. Is that it? Should we be concerned about the fact that the main/head codebase will not be as stable, so users trying to build head (or automated/nightly/gump trying to build head) may run into trouble? Yoav Shapira Millennium Research Informatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
