Branches are used to fork a sub-development path from the main - trunk. Within the current module where the - sources are, there is always at least one "branch" from the main trunk devoted to a stable release - series. The main trunk is where active development takes place for the - next stable series (e.g. 3.2.x). So just prior to each stable series - (e.g. 3.0.x), a branch is created just for stable series releases (e.g. - 3.0.0 -> 3.0.1 -> 3.0.2, etc). Once the initial stable release of - any stable branch has taken place, this branch is only used for bugfixes, which - have had prior testing before being committed to CVS. (See Version Numbers below for details - on versioning.)
-At one time there were two distinct branches: stable and unstable. The more drastic changes were to be in the unstable branch. These branches have now been merged to minimize time and effort of @@ -97,9 +83,8 @@
The source tree is the heart of every software project. Every effort must be made to ensure that it is readable, compilable and consistent - at all times. There are differing guidelines for the stable branch and - the main development trunk, and we ask anyone with CVS access to - strictly adhere to the following guidelines:
+ at all times. We expect anyone with CVS access to strictly adhere to + the following guidelines:Basic Guidelines, for all branches: