><TD
><PRE
CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$I<!-- Break CVS Substitution -->d$";
-/*********************************************************************
+>/*********************************************************************
*
- * File : $S<!-- Break CVS Substitution -->ource$
+ * File : $Source
*
* Purpose : (Fill me in with a good description!)
*
CLASS="PROGRAMLISTING"
>#ifndef _FILENAME_H
#define _FILENAME_H
-#define FILENAME_H_VERSION "$I<!-- Break CVS Substitution -->d$"
/*********************************************************************
*
- * File : $S<!-- Break CVS Substitution -->ource$
+ * File : $Source
*
* Purpose : (Fill me in with a good description!)
*
TITLE="Privoxy Developer Manual"
HREF="index.html"><LINK
REL="PREVIOUS"
-TITLE="The CVS Repository"
-HREF="cvs.html"><LINK
+TITLE="The Git Repository"
+HREF="git.html"><LINK
REL="NEXT"
TITLE="Coding Guidelines"
HREF="coding.html"><LINK
ALIGN="left"
VALIGN="bottom"
><A
-HREF="cvs.html"
+HREF="git.html"
ACCESSKEY="P"
>Prev</A
></TD
><P
> Packagers are encouraged to include this documentation. For those without
the ability to build the docs locally, text versions of each are kept in
- CVS. HTML versions are also being kept in CVS under
+ Git. HTML versions are also being kept in Git under
<TT
CLASS="FILENAME"
>doc/webserver/*</TT
</P
><P
> Documentation writers should please make sure documents build
- successfully before committing to CVS, if possible.
+ successfully before committing to Git, if possible.
</P
><P
> How do you update the webserver (i.e. the pages on privoxy.org)?
></LI
></OL
><P
-> Finished docs should be occasionally submitted to CVS
+> Finished docs should be occasionally submitted to Git
(<TT
CLASS="FILENAME"
>doc/webserver/*/*.html</TT
><H2
CLASS="SECT2"
><A
-NAME="AEN205"
+NAME="AEN203"
>3.3. Privoxy Custom Entities</A
></H2
><P
ALIGN="left"
VALIGN="top"
><A
-HREF="cvs.html"
+HREF="git.html"
ACCESSKEY="P"
>Prev</A
></TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
->The CVS Repository</TD
+>The Git Repository</TD
><TD
WIDTH="34%"
ALIGN="center"
<HTML
><HEAD
><TITLE
->The CVS Repository</TITLE
+>The Git Repository</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
><H1
CLASS="SECT1"
><A
-NAME="CVS"
->2. The CVS Repository</A
+NAME="GIT"
+>2. The Git Repository</A
></H1
><P
> 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
+ need write access to our holy grail, the Git repository. One of the
team members will need to set this up for you. Please read
- this chapter completely before accessing via CVS.
+ this chapter completely before accessing via Git.
</P
><DIV
CLASS="SECT2"
><H2
CLASS="SECT2"
><A
-NAME="CVSACCESS"
->2.1. Access to CVS</A
+NAME="GITACCESS"
+>2.1. Access to Git</A
></H2
><P
-> The project's CVS repository is hosted on
+> The project's Git repository is hosted at the
<A
-HREF="https://sourceforge.net/"
+HREF="https://privoxy.org/"
TARGET="_top"
->SourceForge.</A
+>Privoxy site.</A
>
- For historical reasons, the CVS server is
- called <TT
+ The Git repository URL is
+ <TT
CLASS="LITERAL"
->ijbswa.cvs.sourceforge.net</TT
->, the repository is
- called <TT
+>ssh://git@git.privoxy.org:23/git/privoxy.git</TT
+>,
+ the central repository is called <TT
CLASS="LITERAL"
->ijbswa</TT
->, and the source tree module is called
- <TT
+>privoxy</TT
+>, and the
+ source branch is called <TT
CLASS="LITERAL"
->current</TT
->.
+>master</TT
+>. Subfolders exist
+ within the project for target-dependent build and packaging tools, each
+ including the name of the target operating system in their name (e.g.
+ Windows, OSXPackageBuilder, debian). There is a webview of the Git
+ hierarchy at
+ <A
+HREF="https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree"
+TARGET="_top"
+> https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree</A
+>,
+ which might help with visualizing how these pieces fit together.
</P
></DIV
><DIV
><H2
CLASS="SECT2"
><A
-NAME="CVSBRANCHES"
+NAME="GITBRANCHES"
>2.2. Branches</A
></H2
><P
-> Within the CVS repository, there are modules and branches. As
- mentioned, the sources are in the <TT
-CLASS="LITERAL"
->current</TT
->
- <SPAN
-CLASS="QUOTE"
->"module"</SPAN
->. Other modules are present for platform specific
- issues. There is a webview of the CVS hierarchy at <A
-HREF="http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/"
-TARGET="_top"
->http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/</A
->,
- which might help with visualizing how these pieces fit together.
+> Whilst the central repository contains only the master branch, developers
+ are of course free to create branches in their local repositories as they
+ develop features, fixes, or update the target-dependent tools. Only once
+ such changes are fully tested ought they be pushed back to the central
+ repository master branch.
</P
><P
> At one time there were two distinct branches: stable and unstable. The
><H2
CLASS="SECT2"
><A
-NAME="CVSCOMMIT"
->2.3. CVS Commit Guidelines</A
+NAME="GITCOMMIT"
+>2.3. Git Commit Guidelines</A
></H2
><P
> 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
+ times. We expect anyone with Git access to strictly
adhere to the following guidelines:
</P
><P
></LI
><LI
><P
-> Before changing things on CVS, make sure that your changes are in line
+> Before changing things on Git, make sure that your changes are in line
with the team's general consensus on what should be done.
</P
></LI
></DD
><DT
>2. <A
-HREF="cvs.html"
->The CVS Repository</A
+HREF="git.html"
+>The Git Repository</A
></DT
><DD
><DL
><DT
>2.1. <A
-HREF="cvs.html#CVSACCESS"
->Access to CVS</A
+HREF="git.html#GITACCESS"
+>Access to Git</A
></DT
><DT
>2.2. <A
-HREF="cvs.html#CVSBRANCHES"
+HREF="git.html#GITBRANCHES"
>Branches</A
></DT
><DT
>2.3. <A
-HREF="cvs.html#CVSCOMMIT"
->CVS Commit Guidelines</A
+HREF="git.html#GITCOMMIT"
+>Git Commit Guidelines</A
></DT
></DL
></DD
></DT
><DT
>3.3. <A
-HREF="documentation.html#AEN205"
+HREF="documentation.html#AEN203"
>Privoxy Custom Entities</A
></DT
></DL
TITLE="Privoxy Developer Manual"
HREF="index.html"><LINK
REL="NEXT"
-TITLE="The CVS Repository"
-HREF="cvs.html"><LINK
+TITLE="The Git Repository"
+HREF="git.html"><LINK
REL="STYLESHEET"
TYPE="text/css"
HREF="../p_doc.css"><META
ALIGN="right"
VALIGN="bottom"
><A
-HREF="cvs.html"
+HREF="git.html"
ACCESSKEY="N"
>Next</A
></TD
TARGET="_top"
>privoxy-devel mailing list</A
>.
- You can submit your ideas, or even better patches. Patches are best
+ You can submit your ideas or, even better, patches. Patches are best
submitted to the Sourceforge tracker set up for this purpose, but
can be sent to the list for review too.
</P
><P
-> You will also need to have a cvs package installed, which will
- entail having ssh installed as well (which seems to be a requirement of
- SourceForge), in order to access the cvs repository. Having the GNU build
- tools is also going to be important (particularly, autoconf and gmake).
+> You will also need to have a git package installed, which will
+ entail having ssh installed as well, in order to access the git repository.
+ Having the GNU build tools is also going to be important (particularly,
+ autoconf and gmake).
</P
><P
> For the time being (read, this section is under construction), you can
ALIGN="right"
VALIGN="top"
><A
-HREF="cvs.html"
+HREF="git.html"
ACCESSKEY="N"
>Next</A
></TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
->The CVS Repository</TD
+>The Git Repository</TD
></TR
></TABLE
></DIV
> Z, the point or sub version, represents a release of the software within a branch.
It is therefore incremented immediately before each code freeze.
In development branches, only the even point versions correspond to actual releases,
- while the odd ones denote the evolving state of the sources on CVS in between.
- It follows that Z is odd on CVS in development branches most of the time. There, it gets
+ while the odd ones denote the evolving state of the sources on Git in between.
+ It follows that Z is odd on Git in development branches most of the time. There, it gets
increased to an even number immediately before a code freeze, and is increased to an odd
number again immediately thereafter.
- This ensures that builds from CVS snapshots are easily distinguished from released versions.
+ This ensures that builds from Git snapshots are easily distinguished from released versions.
The point version is reset to zero when the minor changes.
</P
><P
></LI
></UL
><P
-> In summary, the main CVS trunk is the development branch where new
+> In summary, the main Git trunk is the development branch where new
features are being worked on for the next stable series. This should
almost always be where the most activity takes place. There is always at
least one stable branch from the trunk, e.g now it is
><P
> Developers should remember too that if they commit a bugfix to the stable
branch, this will more than likely require a separate submission to the
- main trunk, since these are separate development trees within CVS. If you
+ main trunk, since these are separate development trees within Git. If you
are working on both, then this would require at least two separate check
outs (i.e main trunk, <SPAN
CLASS="emphasis"
><LI
><P
> All documentation should be rebuild after the version bump.
- Finished docs should be then be committed to CVS (for those
+ Finished docs should be then be committed to Git (for those
without the ability to build these). Some docs may require
rather obscure processing tools. <TT
CLASS="FILENAME"
>,
the man page (and the html version of the man page)
fall in this category. README, the man page, AUTHORS, and config
- should all also be committed to CVS for other packagers. The
+ should all also be committed to Git for other packagers. The
formal docs should be uploaded to the webserver. See the
Section "Updating the webserver" in this manual for details.
</P
></LI
><LI
><P
-> Tag all files in CVS with the version number with
+> Tag all files in Git with the version number with
<SPAN
CLASS="QUOTE"
>"<B
><I
CLASS="EMPHASIS"
>you must make sure that you build from clean sources by exporting
- the right version from CVS into an empty directory</I
+ the right version from Git into an empty directory</I
></SPAN
> (just press return when
asked for a password):
>Do NOT change</I
></SPAN
> a single bit, including, but not limited to
- version information after export from CVS. This is to make sure that
+ version information after export from Git. This is to make sure that
all release packages, and with them, all future bug reports, are based
on exactly the same code.
</P
>).
This should be one level up from the manuals. There is a link also
on this page to an HTMLized version of the man page. To avoid 404 for
- this, it is in CVS as
+ this, it is in Git as
<TT
CLASS="FILENAME"
>doc/webserver/man-page/privoxy-man-page.html</TT
packages" above).
</P
><P
-> As the only exception to not changing anything after export from CVS,
+> As the only exception to not changing anything after export from Git,
now examine the file <TT
CLASS="FILENAME"
>privoxy-</TT
packages" above).
</P
><P
-> There are three modules available in the CVS repository for use on Mac
+> There are three modules available in the Git repository for use on Mac
OS X, though technically only two of them generate a release (the other
can be used to install from source).
</P
></H4
><P
> The OSXPackageBuilder module generates OS X installer packages
- supporting all Macs running OS X 10.4 and above. Obtain it from CVS as
+ supporting all Macs running OS X 10.4 and above. Obtain it from Git as
follows into a folder parallel to the exported privoxy source:
</P
><TABLE
>
</P
><P
-> Check out the module from CVS as follows into a folder parallel to the
+> Check out the module from Git as follows into a folder parallel to the
exported privoxy source:
</P
><TABLE
from source on a single machine.
</P
><P
-> Check out the module from CVS as follows into a folder parallel to the
+> Check out the module from Git as follows into a folder parallel to the
exported privoxy source:
</P
><TABLE
>"</SPAN
>. (This is
a separate target due to dependencies on some obscure perl scripts
- [now in CVS, but not well tested]. See comments in <TT
+ [now in Git, but not well tested]. See comments in <TT
CLASS="FILENAME"
>GNUmakefile</TT
>.)
>).
</P
><P
-> Next, commit any changes from the above steps to CVS. All set?
+> Next, commit any changes from the above steps to Git. All set?
If these are docs in the stable branch, then do:
</P
><TABLE
projects / privoxy.git / commitdiff