diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-01-16 11:22:57 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-01-16 11:22:57 +0000 |
| commit | 6a3fdc3a1ea6c306d9543791bf172dd1052d7382 (patch) | |
| tree | c372c6daff13e435e79914c2e40dfe9d370c337b /docs/cvs_branches.html | |
| parent | 0b412f8f156b46b0e7220a2b61e0f41781769f66 (diff) | |
| parent | a03fc8277180e2171519165a724849e2254ef0b7 (diff) | |
Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into vbo-0.2
Conflicts:
src/mesa/array_cache/sources
src/mesa/drivers/dri/i965/brw_context.c
src/mesa/drivers/dri/i965/brw_draw.c
src/mesa/drivers/dri/i965/brw_fallback.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/mach64/mach64_context.c
src/mesa/main/extensions.c
src/mesa/main/getstring.c
src/mesa/tnl/sources
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_save_playback.c
src/mesa/tnl/t_vtx_api.c
src/mesa/tnl/t_vtx_exec.c
src/mesa/vbo/vbo_attrib.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'docs/cvs_branches.html')
| -rw-r--r-- | docs/cvs_branches.html | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/docs/cvs_branches.html b/docs/cvs_branches.html deleted file mode 100644 index 98df3d0f4f..0000000000 --- a/docs/cvs_branches.html +++ /dev/null @@ -1,80 +0,0 @@ -<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 |