User: starksm
Date: 01/06/13 23:17:34
Modified: business CVSAdmin.html
Log:
Add the cvs howtos
Revision Changes Path
1.2 +112 -5 newsite/business/CVSAdmin.html
Index: CVSAdmin.html
===================================================================
RCS file: /cvsroot/jboss/newsite/business/CVSAdmin.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CVSAdmin.html 2001/06/13 19:01:58 1.1
+++ CVSAdmin.html 2001/06/14 06:17:34 1.2
@@ -96,16 +96,44 @@
new 2.4 branch is labeled with a branch tag of Branch_2_4. This fixes the
major version to 2 and the minor version to 4 for all tags on this branch.
<li>
-Event 9
+Event 9 is the creation of a Rel_2_4_0_0 beta release tag in the branch. It serves
as
+an alias to the state of the main branch at the time the 2.4 branch was created.
<li>
-Event 10
+Event 10 is the creation of a Rel_2_5_0_0 alpha release tag on the main trunk. It
+it is also an alias to the state of the main branch at the time of the 2.4 branch
+creation.
<li>
-Event 11
+Event 11 is the integration of the first patch/change into the 2.4 branch. After
+the code is commited the Rel_2_4_0_1 tag is applied.
<li>
-Event 11
+Event 12 is the release of the initial 2.4 branch binary. The release is tagged
+as JBoss_2_4_0 as well as Rel_2_4_1_0 to start the next beta series.
</ol>
-<h1>CVS Release Task Details</h1>
+<h1>CVS Task HowTo</h1>
+
+<h2>Checking code into the main trunk</h2>
+New features and bug fixes on unreleased code should go into the main trunk
+which is the latest development branch. The steps for doing this are:
+<ol>
+<li>Checkout the target module in which the changes are to be made. For example
+to commit changes to the jboss module do:
+<pre>cvs co jboss</pre>
+<li>Make your chages to the source in the jboss working directory created
+by the previous check out.
+<li>Commit your changes. Do this by executing the following command in the
+directory you made the changes in, or any common parent directory:
+<pre>cvs commit -m "Your commit msg"</pre>
+You don't have to specify the commit msg on the commit command line. If you
+don't you will be prompted for the commit msg. Note that this will apply the
+same commit msg to all files you have changed. If you want specific commit
+msgs for each file then you can perform a seperate commit on each file.
+<li>(optional) Tag the code with the next alpha build tag. For example,
+to tag the jboss source tree with a Rel_2_3_1_3 tag, do:
+<pre>cvs tag Rel_2_3_1_3</pre>
+from within the jboss/src working directory.
+</ol>
+
<h2>Creating a new binary release branch</h2>
<ol>
<li>
@@ -136,5 +164,84 @@
cvs tag Rel_2_2_0_0
</pre>
</ol>
+
+<h2>Checking in a patch on a release branch</h2>
+When you have changes that need to go into the codebase of a release branch,
+you need to check out that branch and make the changes. So for example,
+if you need to add a patch the the 2.2 branch of the example cvs structure
+above, you need to first check out the 2.2 branch using the Branch_2_2 tag.
+<li>Checkout the module using the branch tag you want to work on. To
+checkout the 2.2 branch of the jboss module do:
+<pre>cvs co -r Branch_2_2 jboss</pre>
+This will create a jboss working directory with a sticky tag that associates
+the source code with the 2.2 branch. If you look at the
jboss/src/main/org/jboss/Main.java
+file in the jboss working directory that results from the previous command using
+the cvs status command you will see something like:
+<pre>
+bash-2.04$ cd jboss/src/main/org/jboss/
+bash-2.04$ cvs status Main.java
+===================================================================
+File: no file Main.java Status: Needs Checkout
+
+ Working revision: 1.30.2.6
+ Repository revision: 1.30.2.6
/cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
+ Sticky Tag: Branch_2_2 (branch: 1.30.2)
+ Sticky Date: (none)
+ Sticky Options: (none)
+</pre>
+This shows that the "Sticky Tag:" is set to the Branch_2_2 tag as we requested.
+
+<li>Make your chages to the source in the jboss working directory created
+by the previous check out.
+
+<li>Commit your changes. Do this by executing the following command in the
+directory you made the changes in, or any common parent directory:
+<pre>cvs commit -m "Your commit msg"</pre>
+You don't have to specify the commit msg on the commit command line. If you
+don't you will be prompted for the commit msg. Note that this will apply the
+same commit msg to all files you have changed. If you want specific commit
+msgs for each file then you can perform a seperate commit on each file.
+
+<li>(Required) Tag the branch with the next beta binary release tag by incrementing
+the build number of the latest tag. To determine what build number to use, look
+at all of the tags for a file using the cvs status command with the -v option.
+For example, looking at jboss/src/main/org/jboss/Main.java again:
+<pre>
+bash-2.04$ cvs status -v Main.java
+===================================================================
+File: no file Main.java Status: Needs Checkout
+
+ Working revision: 1.30.2.6
+ Repository revision: 1.30.2.6
/cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
+ Sticky Tag: Branch_2_2 (branch: 1.30.2)
+ Sticky Date: (none)
+ Sticky Options: (none)
+
+ Existing Tags:
+ Rel_2_3_1_0 (revision: 1.34)
+ Rel_2_2_2_0 (revision: 1.30.2.6)
+ JBoss_2_2_2 (revision: 1.30.2.6)
+ JBoss_2_2_1 (revision: 1.30.2.3)
+ Rel_2_2_1_0 (revision: 1.30.2.3)
+</pre>
+The Rel_2_2_2_0 tag is the latest tag on the 2.2 branch and indicates that
+no patches have been made since the JBoss_2_2_2 release. So to tag the changes
+you have made you need to use Rel_2_2_2_1. Do this using:
+<pre>cvs tag Rel_2_2_2_1</pre>
+from the top of the jboss working directory.
+
+<li>(Required) Merge the changes to the main trunk if they are missing. You
+need to validate that the changes you have made to the release branch are
+not already in the main trunk and merge the changes if they are.
+
+<li>(Required, if merge was done) Check out the latest trunk code:
+<pre>cvs co jboss</pre>
+<li>(Required, if merge was done) Tag the main trunk with the next alpha
+build tag. Assuming the this is Rel_2_3_1_5, you would do:
+<pre>cvs tag Rel_2_3_1_5</pre>
+from within the jboss working directory you just checked out.
+</ul>
+
</body>
</html>
+
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
