X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fdeveloper-manual%2Fcvs.html;h=f455e0a4368c2e6f1622355d99ecef3c97ef1f34;hb=8183b8e71365338bb8c7b7324528f0dc0b0b0395;hp=798649942a7bba8fb7571cdccb4952c02172d753;hpb=a5b1999794b4b0faa68812c0b8b2861316ae8341;p=privoxy.git diff --git a/doc/webserver/developer-manual/cvs.html b/doc/webserver/developer-manual/cvs.html index 79864994..f455e0a4 100644 --- a/doc/webserver/developer-manual/cvs.html +++ b/doc/webserver/developer-manual/cvs.html @@ -1,383 +1,162 @@ -The CVS Repository
Privoxy Developer Manual
PrevNext

2. The CVS Repository

If you intend to help us with programming, documentation or packaging - you will need write access to our holy grail, the CVS repository. - Please read this chapter completely before accessing via CVS. -

2.1. Access to CVS

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 cvs.ijbswa.sourceforge.net, the repository is - called ijbswa, and the source tree module is called - current. -

2.2. Branches

Within the CVS repository, there are modules and branches. As - 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://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/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). - And for testing bugfixes for the stable series. 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.) -

2.3. CVS Commit Guidelines

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: -

Basic Guidelines, for all branches: -

-

Stable branches are handled with decidedly more care, especially after - the initial *.*.0 release, and we are just in bugfix mode. In addition - to the above, the below applies only to the stable branch (currently - the v_3_0_branchpoint branch): -

-


PrevHomeNext
Introduction Documentation Guidelines
\ No newline at end of file + + + + + The CVS Repository + + + + + + + + + + + +
+

2. The CVS Repository

+ +

If you become part of the active development team, you will eventually + need write access to our holy grail, the CVS repository. One of the team + members will need to set this up for you. Please read this chapter + completely before accessing via CVS.

+ +
+

2.1. Access to + CVS

+ +

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.

+
+ +
+

2.2. + Branches

+ +

Within the CVS repository, there are modules and branches. As + 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.

+ +

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 + maintaining two branches.

+
+ +
+

2.3. CVS Commit + Guidelines

+ +

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

+ +

Basic Guidelines, for all branches:

+ + +
+
+ + + +