| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 1 | <HTML> |
| 2 | |
| 3 | <TITLE>CVS Branches</TITLE> |
| 4 | |
| Brian Paul | 36da045 | 2005-01-20 03:55:10 +0000 | [diff] [blame^] | 5 | <link rel="stylesheet" type="text/css" href="mesa.css"></head> |
| 6 | |
| 7 | <BODY> |
| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 8 | |
| 9 | <H1>CVS Branch Information</H1> |
| 10 | |
| 11 | <p> |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 12 | At any given time, there may be several active branches in Mesa's |
| 13 | CVS repository. |
| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 14 | |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 15 | Generally, the CVS trunk contains the latest development (unstable) |
| 16 | code while a CVS branch has the latest stable code. |
| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 17 | </p> |
| 18 | |
| 19 | <p> |
| Brian Paul | 7e73b1a | 2004-10-02 15:26:25 +0000 | [diff] [blame] | 20 | Currently (Oct 2004), the trunk is the Mesa 6.3 development code |
| 21 | while the mesa_6_2_branch branch has the stable Mesa 6.2.x code. |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 22 | </p> |
| 23 | |
| 24 | <p> |
| 25 | Mesa releases use an even/odd numbering scheme to represent stable/development |
| 26 | releases. |
| 27 | |
| Brian Paul | 7e73b1a | 2004-10-02 15:26:25 +0000 | [diff] [blame] | 28 | For example, Mesa 6.2 (0 is considered even) is a stable release while |
| 29 | Mesa 6.3 is a development release. |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 30 | </p> |
| 31 | |
| 32 | <p> |
| 33 | To checkout a specific CVS branch pass <code>-r</code> and |
| 34 | the branch tag after your CVS command. |
| 35 | |
| Brian Paul | 7e73b1a | 2004-10-02 15:26:25 +0000 | [diff] [blame] | 36 | For example <code>cvs checkout -r mesa_6_2_branch Mesa</code> will |
| 37 | checkout the 6.2 branch and <code>cvs update -r |
| 38 | mesa_6_2_branch</code> will convert your current CVS tree to the 6.2 |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 39 | branch. |
| 40 | |
| 41 | Consult <a href="http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54" |
| 42 | target="_parent">http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54</a> |
| 43 | for more on branching in CVS. |
| 44 | </p> |
| 45 | |
| 46 | <p> |
| 47 | To see a list of all the CVS branches run <code>cvs log README</code> (or any |
| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 48 | other file) and look for the section labeled <code>symbolic names</code>. |
| 49 | You'll see something like this: |
| 50 | </p> |
| 51 | |
| 52 | <pre> symbolic names: |
| 53 | mesa_4_0: 1.3 |
| 54 | mesa_4_0_branch: 1.3.0.6 |
| 55 | mesa_3_5: 1.3 |
| 56 | mesa_3_4_2: 1.3 |
| 57 | mesa_3_4_1: 1.3 |
| 58 | mesa_3_4: 1.3 |
| 59 | mesa_3_4_branch: 1.3.0.4 |
| 60 | mesa_3_3: 1.3 |
| 61 | mesa_3_2_1: 1.1.1.1 |
| 62 | mesa_3_3_texture_env_combine2: 1.3.0.2 |
| 63 | mesa_3_2: 1.1.1.1 |
| 64 | mesa_3_2_beta_1: 1.1.1.1 |
| 65 | mesa_3_1: 1.1.1.1 |
| 66 | mesa_3_2_dev: 1.1.1.1.0.2 |
| 67 | mesa_3_1_beta_3: 1.1.1.1 |
| 68 | start: 1.1.1.1 |
| 69 | mesa: 1.1.1 |
| 70 | </pre> |
| 71 | |
| Brian Paul | 69449a9 | 2003-11-26 18:10:19 +0000 | [diff] [blame] | 72 | <p> |
| 73 | Most will be obsolete branches. Generally, the newer branches are at |
| 74 | the top. Ask on the mesa3d-dev mailing list to learn which branches |
| 75 | are active. |
| 76 | </p> |
| 77 | |
| 78 | |
| Brian Paul | 0b27ace | 2003-03-08 17:38:57 +0000 | [diff] [blame] | 79 | </body> |
| 80 | </html> |