From 041b80fcd9e6d7b499f08a6163ead3dc3efa4d3d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 14 Apr 2010 19:10:20 -0700 Subject: [PATCH] * admin/notes/BRANCH: Update. --- admin/notes/BRANCH | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH index 258fcd95566..5caa9e5905f 100644 --- a/admin/notes/BRANCH +++ b/admin/notes/BRANCH @@ -1,29 +1,26 @@ -This file describes the bzr branch in which it is maintained. -Everything below the line is branch-specific. -________________________________________________________________________ +You can view the available Emacs branches at + +http://bzr.savannah.gnu.org/r/emacs/ -This is the trunk (sometimes mistakenly called "HEAD"). -When people say "use the development version of Emacs" or the -"bzr version of Emacs", this is the branch they are talking about. +Development normally takes places on the trunk. +Sometimes specialized features are developed on separate branches +before possibly being merged to the trunk. -Emacs development takes place on the trunk. Most of the time, Emacs -hackers add to it relatively free of constraint (aside from proper -legal / accounting practices), although sometimes there is related -discussion on the emacs-devel mailing list. +Development is discussed on the emacs-devel mailing list. -Sometime before the release of a new major version of Emacs (eg 22.1), +Sometime before the release of a new major version of Emacs (eg 23.2), a "feature freeze" is imposed on the trunk. No new features may be -added after this point. This is usually many months before the release. -During this time, there is no official place for development of new features. +added after this point. This is usually some months before the release. -Shortly before the release, a release branch is created. For example, -EMACS_22_BASE or EMACS_21_1_RC for Emacs 22.x and 21.x, respectively. -(Unfortunately the naming scheme has not always been consistent.) +Shortly before the release, a release branch is created, and the +trunk is then free for development. +For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for +23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x. -The release branch is used to make the release (22.1), and all later -members of the series (22.2, 22.3, etc). Generally, only bug-fixes have -been allowed in the minor releases, although in 22.x, self-contained -new features were allowed on a case-by-case basis. +Traditionally only bug-fixes were allowed in minor releases. +Recently (22.x, 23.2), self-contained new features were allowed on a +case-by-case basis. -From the point that a release branch is created, the trunk is free for -development for the next major version. +If you are looking at this file in a branch other than the trunk, +there may be some branch-specific documentation below this line. +________________________________________________________________________ -- 2.39.2