$FreeBSD: head/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $

MAINTAINER=	peter@FreeBSD.org

This directory contains the virgin CVS source on the vendor branch.  Do
not under any circumstances commit new versions onto the mainline, new
versions or official-patch versions must be imported.

To prepare a new cvs dist for import, extract it into a fresh directory;
then delete the files and directories listed in FREEBSD-Xlist.

CVS is imported from its top level directory something like this:
  cvs -n import src/contrib/cvs CVSHOME v<version>

The -n option is "don't do anything" so you can see what is about to happen
first.  Remove it when it looks ok.

The initial import was done with:
  cvs import src/contrib/cvs CVSHOME v1_11_22

When new versions are imported, cvs will give instructions on how to merge
the local and vendor changes when/if conflicts arise.

The developers can be reached at:  <devel-cvs@nongnu.org>.  Local changes
that are suitable for public consumption should be submitted for inclusion
in future releases.

peter@freebsd.org - 20 Aug 1996
obrien@freebsd.org - 12 Jan 2008

Current local changes:
  - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the
    magic branch number.  (for CVSup local-commit support)
  - CVSREADONLYFS environment variable and global option -R to enable
    no-locking readonly mode (eg: cvs repo is a cdrom or mirror)
  - the verify message script can edit the submitted log message.
  - CVSROOT/options file
  - Variable keyword expansion controls including custom keywords.
  - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
  - 'CVS_OPTIONS' environmental variable support.
  - Allow -D with -r on checkout.
  - Support for "diff -j", allowing tag:date based diffs.
  - iso8601 option keyword.
  - Comprehensive "-T" CVS/Template support.
  - We use the cvs.1 manpage from man/, not the offical one in doc/
