Mercurial > emacs
annotate admin/notes/BRANCH @ 112436:473533159689
Mark tiny change.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 22 Jan 2011 19:33:59 -0800 |
parents | afb992a317bd |
children |
rev | line source |
---|---|
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
1 You can view the available Emacs branches at |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
2 |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
3 http://bzr.savannah.gnu.org/r/emacs/ |
55428 | 4 |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
5 Development normally takes places on the trunk. |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
6 Sometimes specialized features are developed on separate branches |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
7 before possibly being merged to the trunk. |
102135 | 8 |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
9 Development is discussed on the emacs-devel mailing list. |
55428 | 10 |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
11 Sometime before the release of a new major version of Emacs (eg 23.2), |
102135 | 12 a "feature freeze" is imposed on the trunk. No new features may be |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
13 added after this point. This is usually some months before the release. |
55428 | 14 |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
15 Shortly before the release, a release branch is created, and the |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
16 trunk is then free for development. |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
17 For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
18 23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x. |
102135 | 19 |
107866
afb992a317bd
* admin/notes/BRANCH: Defer to emacs-devel.
Glenn Morris <rgm@gnu.org>
parents:
107860
diff
changeset
|
20 Consult emacs-devel for exactly what kinds of changes are allowed |
afb992a317bd
* admin/notes/BRANCH: Defer to emacs-devel.
Glenn Morris <rgm@gnu.org>
parents:
107860
diff
changeset
|
21 on what branch at any time. |
102135 | 22 |
107860
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
23 If you are looking at this file in a branch other than the trunk, |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
24 there may be some branch-specific documentation below this line. |
d5a9f1780d1e
* admin/notes/BRANCH: Update.
Glenn Morris <rgm@gnu.org>
parents:
106879
diff
changeset
|
25 ________________________________________________________________________ |