summaryrefslogtreecommitdiffstats
path: root/contrib/cvs
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2008-01-13 06:35:22 +0000
committerobrien <obrien@FreeBSD.org>2008-01-13 06:35:22 +0000
commit364a5112a564e9de0069186464caebc47ce20d89 (patch)
tree9a34537f86264effe581c18baacedff5f48859a5 /contrib/cvs
parenta7a5f3ec0275366c28e08095fa24d2657be8984f (diff)
downloadFreeBSD-src-364a5112a564e9de0069186464caebc47ce20d89.zip
FreeBSD-src-364a5112a564e9de0069186464caebc47ce20d89.tar.gz
Update for the 1.11.22 import.
Reviewed/begged-for by: peter
Diffstat (limited to 'contrib/cvs')
-rw-r--r--contrib/cvs/FREEBSD-upgrade11
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index d884b28..67b13c2 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -16,16 +16,17 @@ 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_8_1
+ 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@cyclic.com>. Local changes
+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
@@ -36,3 +37,9 @@ Current local changes:
- 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/
OpenPOWER on IntegriCloud