diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-08 17:38:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-08 17:38:57 +0000 |
| commit | 0b27aceae2464db3dd149cf4fd667e353a655c5e (patch) | |
| tree | a8df88dd0893e04a6fe4f125ddd361a1bde9d7ae /docs/cvs_branches.html | |
| parent | dc32636cfd38916ad7b2150e10765026dbb64ce5 (diff) | |
Documentation/website overhaul. The website content and doc/ directory
are now merged and are one and the same.
Diffstat (limited to 'docs/cvs_branches.html')
| -rw-r--r-- | docs/cvs_branches.html | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/docs/cvs_branches.html b/docs/cvs_branches.html new file mode 100644 index 00000000000..ecb524e20e2 --- /dev/null +++ b/docs/cvs_branches.html @@ -0,0 +1,59 @@ +<HTML> + +<TITLE>CVS Branches</TITLE> + +<BODY text="#000000" bgcolor="#55bbff" link="#111188"> + +<H1>CVS Branch Information</H1> + +<p> +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 <code>mesa_3_4_branch</code> 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.<p></p> <p>All versions of +Mesa after 3.0 will also be tagged with a branch id. Mesa 3.1 has the +tag <code>mesa_3_1</code>, Mesa 3.2 will be <code>mesa_3_2</code>, +Mesa 3.3 <code>mesa_3_3</code>, etc..</p> + +<p> +To checkout a specific branch of mesa just pass <code>-r</code> and +the branch tag after your cvs command. For example <code>cvs checkout +-r mesa_3_4_branch Mesa</code> will checkout the 3.4 branch and +<code>cvs update -r mesa_3_4_branch</code> will convert your current +branch to the 3.4 dev 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 branchs 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> + +</body> +</html>
\ No newline at end of file |