X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fdeveloper-manual%2Fcvs.html;h=f455e0a4368c2e6f1622355d99ecef3c97ef1f34;hb=8183b8e71365338bb8c7b7324528f0dc0b0b0395;hp=5302a34f503e382036f226194cb22b0563569685;hpb=5fd77903894c0798908743d90ce72b9bdf2cce7d;p=privoxy.git diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html index 5302a34f..f455e0a4 100644 --- a/doc/webserver/developer-manual/cvs.html +++ b/doc/webserver/developer-manual/cvs.html @@ -12,20 +12,10 @@ "documentation.html"> - - +
@@ -81,20 +71,6 @@ body { "_top">http://ijbswa.cvs.sourceforge.net/ijbswa/, which might help with visualizing how these pieces fit together.

-

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 @@ -107,9 +83,8 @@ body {

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:

@@ -122,9 +97,10 @@ body {
  • Your commit message should give a concise overview of - what you changed (no big - details) and why you changed - it Just check previous messages for good examples.

    + what you + changed (no big details) and why you changed it Just + check previous messages for good examples.

  • @@ -157,7 +133,7 @@ body {