summaryrefslogtreecommitdiff
path: root/docs/cvs_branches.html
blob: 5f653b78306e96781634b320e288ababbde43428 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
<HTML>

<TITLE>CVS Branches</TITLE>

<BODY text="#000000" bgcolor="#55bbff" link="#111188">

<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 (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.
</p>

<p>
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.
</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_5_0_branch Mesa</code> will
checkout the 5.0.x branch and <code>cvs update -r
mesa_5_0_branch</code> will convert your current CVS tree to the 5.0.x
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>