summaryrefslogtreecommitdiffstats
path: root/docs/cvs_branches.html
diff options
context:
space:
mode:
authorDavid Nusinow <[email protected]>2005-11-09 02:46:07 +0000
committerDavid Nusinow <[email protected]>2005-11-09 02:46:07 +0000
commitc37d6b4ca8a9a7ac42a2e0082cf1bb0acbbff3cc (patch)
tree85b03b216318e1c3c138fd1f4371df3d3ac2dd35 /docs/cvs_branches.html
Commit Mesa 6.4 sources and packaging
Diffstat (limited to 'docs/cvs_branches.html')
-rw-r--r--docs/cvs_branches.html80
1 files changed, 80 insertions, 0 deletions
diff --git a/docs/cvs_branches.html b/docs/cvs_branches.html
new file mode 100644
index 00000000000..98df3d0f4f7
--- /dev/null
+++ b/docs/cvs_branches.html
@@ -0,0 +1,80 @@
+<HTML>
+
+<TITLE>CVS Branches</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<H1>CVS Branch Information</H1>
+
+<p>
+At any given time, there may be several active branches in Mesa's
+CVS repository.
+
+Generally, the CVS trunk contains the latest development (unstable)
+code while a CVS branch has the latest stable code.
+</p>
+
+<p>
+Currently (Oct 2004), the trunk is the Mesa 6.3 development code
+while the mesa_6_2_branch branch has the stable Mesa 6.2.x code.
+</p>
+
+<p>
+Mesa releases use an even/odd numbering scheme to represent stable/development
+releases.
+
+For example, Mesa 6.2 (0 is considered even) is a stable release while
+Mesa 6.3 is a development release.
+</p>
+
+<p>
+To checkout a specific CVS branch pass <code>-r</code> and
+the branch tag after your CVS command.
+
+For example <code>cvs checkout -r mesa_6_2_branch Mesa</code> will
+checkout the 6.2 branch and <code>cvs update -r
+mesa_6_2_branch</code> will convert your current CVS tree to the 6.2
+branch.
+
+Consult <a href="http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54"
+target="_parent">http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54</a>
+for more on branching in CVS.
+</p>
+
+<p>
+To see a list of all the CVS branches run <code>cvs log README</code> (or any
+other file) and look for the section labeled <code>symbolic names</code>.
+You'll see something like this:
+</p>
+
+<pre> symbolic names:
+ mesa_4_0: 1.3
+ mesa_4_0_branch: 1.3.0.6
+ mesa_3_5: 1.3
+ mesa_3_4_2: 1.3
+ mesa_3_4_1: 1.3
+ mesa_3_4: 1.3
+ mesa_3_4_branch: 1.3.0.4
+ mesa_3_3: 1.3
+ mesa_3_2_1: 1.1.1.1
+ mesa_3_3_texture_env_combine2: 1.3.0.2
+ mesa_3_2: 1.1.1.1
+ mesa_3_2_beta_1: 1.1.1.1
+ mesa_3_1: 1.1.1.1
+ mesa_3_2_dev: 1.1.1.1.0.2
+ mesa_3_1_beta_3: 1.1.1.1
+ start: 1.1.1.1
+ mesa: 1.1.1
+</pre>
+
+<p>
+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.
+</p>
+
+
+</body>
+</html> \ No newline at end of file