Re: CVS branching

2004-06-02 Thread Remy Maucherat
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

RE: CVS branching

2004-06-02 Thread Shapira, Yoav
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

Re: CVS branching

2004-06-02 Thread Costin Manolache
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

Re: CVS branching

2004-06-02 Thread Remy Maucherat
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

Re: CVS branching

2004-06-02 Thread Filip Hanik - Dev
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

RE: CVS branching

2004-06-02 Thread Shapira, Yoav
, 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

Re: CVS branching

2004-06-02 Thread Jess Holle
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

RE: CVS branching

2004-06-02 Thread Shapira, Yoav
: 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

Re: CVS branching

2004-06-02 Thread Filip Hanik - Dev
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

CVS branching

2004-06-01 Thread Shapira, Yoav
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

Re: CVS branching

2004-06-01 Thread Bill Barker
: 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

RE: CVS branching

2004-06-01 Thread Shapira, Yoav
- 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