Index: openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp,v diff -u -N -r1.1.2.17 -r1.1.2.18 --- openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp 21 Apr 2017 15:07:52 -0000 1.1.2.17 +++ openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp 2 Jun 2017 11:12:57 -0000 1.1.2.18 @@ -10,15 +10,15 @@

CVS Guidelines

-
($‌Id: cvs.xml,v 1.6.14.2 2016/08/05 14:27:22 +
($‌Id: cvs.xml,v 1.6.14.4 2017/04/22 17:18:48 gustafn Exp $)

By Joel Aufrecht with input from Jeff Davis, Branimir Dolicki, and Jade Rubick.

OpenACS docs are written by the named authors, and may be edited by OpenACS documentation staff.

Using CVS with OpenACS

-Getting Started

All OpenACS code is available anonymously. To get code +Getting Started

All OpenACS code is available anonymously. To get code anonymously, use the parameter -d:pserver:anonymous\@cvs.openacs.org:/cvsroot immediately after cvs in a cvs command to check out or export code.

If you are an OpenACS developer, you should check out code so @@ -42,7 +42,7 @@ User joel

With this setup, you will be asked for your password with each cvs command. To avoid this, set up ssh certificate authentication -for your openacs account. (More information)

You may want to set some more default actions for CVS usage. To +for your OpenACS account. (More information)

You may want to set some more default actions for CVS usage. To do so, create the file ~/.cvsrc with the contents:

cvs -z6
 cvs -q

@@ -81,7 +81,7 @@

-Checkout for Package Development

If you are actively developing a non-core package, you should +Checkout for Package Development

If you are actively developing a non-core package, you should work from the latest core release branch. Currently this is oacs-5-9. This ensures that you are working on top of a stable OpenACS core, but still allows you to commit feature changes to @@ -98,7 +98,7 @@ packages and their current state.

-Checkout for Core Development

If you are actively developing packages in the OpenACS Core, +Checkout for Core Development

If you are actively developing packages in the OpenACS Core, work from the HEAD branch. HEAD is used for active development of the next version of core OpenACS. It may be very buggy; it may not even install correctly. Do not use this branch for development of @@ -107,7 +107,7 @@ developer account:

cvs -d:ext:cvs.openacs.org:/cvsroot checkout acs-core

To check out HEAD anonymously:

cvs -d:pserver:anonymous\@cvs.openacs.org:/cvsroot checkout acs-core

-Checkout .LRN

.LRN consists of a given version openacs core, plus a set of +Checkout .LRN

.LRN consists of a given version OpenACS core, plus a set of packages. These are collectively packages together to form a distribution of .LRN. F .LRN 2.0.0 sits on top of OpenACS 5.0.0. .LRN also uses an OpenACS install.xml file during installation; @@ -132,11 +132,11 @@

OpenACS CVS Concepts

-Modules

All OpenACS code resides within a single CVS module, +Modules

All OpenACS code resides within a single CVS module, openacs-4. (The openacs-4 directory contains code for all versions of OpenACS 4 and later, and .LRN 1 and later.) Checking out this module retrieves all -openacs code of any type. For convenience, subsets of openacs-4 are repackaged as smaller +OpenACS code of any type. For convenience, subsets of openacs-4 are repackaged as smaller modules.

acs-core contains only critical common packages. It does not have any user applications, @@ -169,7 +169,7 @@ module of the same name.

- Tags and Branches

Tags and Branches look similar in commands, but behave + Tags and Branches

Tags and Branches look similar in commands, but behave differently. A tag is a fixed point on a branch. Check out a tag to get a specific version of OpenACS. Check out a branch to get the most current code for that major-minor version (e.g., 5.0.x or @@ -221,7 +221,7 @@ not new features, should be added to core packages on release branches. For all other packages, release branches are the recommended location for development. For example, if you are -working on calendar, which is compatible with openacs 5.0 but not +working on calendar, which is compatible with OpenACS 5.0 but not 5.1, work on the oacs-5-0 branch.

  • HEAD is a branch used for @@ -248,9 +248,8 @@ files, and your comments, are sent to a mailing list for OpenACS developers. A Core Team developer may review or roll back your changes if necessary.

    -
  • Confirm via the OpenACS CVS -browser that your changes are where you intended them to -be.

  • +
  • Confirm via the OpenACS CVS browser that your changes are where you +intended them to be.

  • Add a new package. Contact the Core Team to get @@ -416,7 +415,7 @@

    - Informal Guidelines

    Informal guidelines which may be obsolete in places and should + Informal Guidelines

    Informal guidelines which may be obsolete in places and should be reviewed:

    Additional Resources for CVS