You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by "Shapira, Yoav" <Yo...@mpi.com> on 2004/06/01 15:00:51 UTC
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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: CVS branching
Posted by Costin Manolache <cm...@yahoo.com>.
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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: CVS branching
Posted by Bill Barker <wb...@wilshire.com>.
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" <Yo...@mpi.com>
To: "Tomcat Developers List" <to...@jakarta.apache.org>
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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: CVS branching
Posted by Remy Maucherat <re...@apache.org>.
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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org