diff --git a/docs/cvs_branches.html b/docs/cvs_branches.html index ecb524e20e2..5f653b78306 100644 --- a/docs/cvs_branches.html +++ b/docs/cvs_branches.html @@ -7,30 +7,42 @@
-The Mesa3d sources are split up into two branches. A branch that is to
-remain as stable as possible, and an unstable branch where development
-work for new versions will be done. The current stable branch is
-tagged mesa_3_4_branch
while the unstable branch is just
-the default. The goal is to adopt and even/odd stable/unstable
-versioning scheme similar to the Linux kernel. Hence releases of Mesa
-3.2.X should be more stable than Mesa 3.3.X.
All versions of
-Mesa after 3.0 will also be tagged with a branch id. Mesa 3.1 has the
-tag mesa_3_1
, Mesa 3.2 will be mesa_3_2
,
-Mesa 3.3 mesa_3_3
, etc..
-To checkout a specific branch of mesa just pass -r
and
-the branch tag after your cvs command. For example cvs checkout
--r mesa_3_4_branch Mesa
will checkout the 3.4 branch and
-cvs update -r mesa_3_4_branch
will convert your current
-branch to the 3.4 dev branch.
-Consult http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54
-for more on branching in cvs.
+Generally, the CVS trunk contains the latest development (unstable)
+code while a CVS branch has the latest stable code.
-To see a list of all the CVS branchs run cvs log README
(or any
+Currently (Nov 2003), the trunk is the Mesa 5.1 development code
+while the mesa_5_0_branch branch has the stable Mesa 5.0.x code.
+
+Mesa releases use an even/odd numbering scheme to represent stable/development +releases. + +For example, Mesa 5.0.x (0 is considered even) is a stable release while +Mesa 5.1.x is a development release. +
+ +
+To checkout a specific CVS branch pass -r
and
+the branch tag after your CVS command.
+
+For example cvs checkout -r mesa_5_0_branch Mesa
will
+checkout the 5.0.x branch and cvs update -r
+mesa_5_0_branch
will convert your current CVS tree to the 5.0.x
+branch.
+
+Consult http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54
+for more on branching in CVS.
+
+To see a list of all the CVS branches run cvs log README
(or any
other file) and look for the section labeled symbolic names
.
You'll see something like this:
+Most will be obsolete branches. Generally, the newer branches are at +the top. Ask on the mesa3d-dev mailing list to learn which branches +are active. +
+ +