X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fwebserver%2Fdeveloper-manual%2Fcvs.html;h=3262477060a9a64766a64c97d6af632b64e394b2;hb=1c4bd7276a5f733e283c0484803bfca670f76654;hp=3db67f4fc0fd9011032a4f590eb962b1fa6bfa90;hpb=6d810395712f0337682205c4ea304009c86c128f;p=privoxy.git diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html index 3db67f4f..32624770 100644 --- a/doc/webserver/developer-manual/cvs.html +++ b/doc/webserver/developer-manual/cvs.html @@ -2,7 +2,6 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> - The CVS Repository @@ -14,18 +13,9 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> "documentation.html"> - - +

@@ -63,14 +53,11 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">

The project's CVS repository is hosted on SourceForge. Please - refer to the chapters 6 and 7 in SF's site - documentation for the technical access details for your - operating system. For historical reasons, the CVS server is called - ijbswa.cvs.sourceforge.net, the repository - is called ijbswa, and the source tree - module is called current. + "https://sourceforge.net/" target="_top">SourceForge. For + historical reasons, the CVS server is called ijbswa.cvs.sourceforge.net, the repository is called + ijbswa, and the source tree module is + called current.

@@ -82,25 +69,9 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> mentioned, the sources are in the current "module". Other modules are present for platform specific issues. There is a webview of the CVS hierarchy - at 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 http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/, + which might help with visualizing how these pieces fit together.

At one time there were two distinct branches: stable and unstable. @@ -116,9 +87,8 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">

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: + consistent at all times. We expect anyone with CVS access to + strictly adhere to the following guidelines:

Basic Guidelines, for all branches: @@ -169,7 +139,7 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd"> Note that near a major public release, we get more cautious. There is always the possibility to submit a patch to the patch tracker instead.

@@ -177,7 +147,7 @@ Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">