|
55428
|
1 This file describes the CVS branch in which it is maintained.
|
|
|
2 Everything below the line is branch-specific.
|
|
|
3 ________________________________________________________________________
|
|
|
4
|
|
102135
|
5 This is the trunk (sometimes mistakenly called "HEAD").
|
|
|
6 When people say "use CVS emacs", this is the branch they are talking
|
|
|
7 about. Likewise, a "cvs checkout" without the "-r" option results in
|
|
|
8 this branch.
|
|
|
9
|
|
|
10 Emacs development takes place on the trunk. Most of the time, Emacs
|
|
|
11 hackers add to it relatively free of constraint (aside from proper
|
|
|
12 legal / accounting practices), although sometimes there is related
|
|
|
13 discussion on the emacs-devel mailing list.
|
|
55428
|
14
|
|
102135
|
15 Sometime before the release of a new major version of Emacs (eg 22.1),
|
|
|
16 a "feature freeze" is imposed on the trunk. No new features may be
|
|
|
17 added after this point. This is usually many months before the release.
|
|
|
18 During this time, there is no official place for development of new features.
|
|
55428
|
19
|
|
102135
|
20 Shortly before the release, a release branch is created. For example,
|
|
|
21 EMACS_22_BASE or EMACS_21_1_RC for Emacs 22.x and 21.x, respectively.
|
|
|
22 (Unfortunately the naming scheme has not always been consistent.)
|
|
|
23
|
|
|
24 The release branch is used to make the release (22.1), and all later
|
|
|
25 members of the series (22.2, 22.3, etc). Generally, only bug-fixes have
|
|
|
26 been allowed in the minor releases, although in 22.x, self-contained
|
|
|
27 new features were allowed on a case-by-case basis.
|
|
|
28
|
|
|
29 From the point that a release branch is created, the trunk is free for
|
|
|
30 development for the next major version.
|
