diff options
| author | peter <peter@FreeBSD.org> | 2002-09-02 05:58:30 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-02 05:58:30 +0000 |
| commit | 1ab798bddc1c07ca3be1a423787e4d63d9853b6f (patch) | |
| tree | 49f701a4b856594a14e0ced541aaaaff8cd29c03 /contrib | |
| parent | a2b6a3a9b8cf8113c377699deba118c6b57d881e (diff) | |
| download | FreeBSD-src-1ab798bddc1c07ca3be1a423787e4d63d9853b6f.zip FreeBSD-src-1ab798bddc1c07ca3be1a423787e4d63d9853b6f.tar.gz | |
Minor updates after 1.11.2 import
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cvs/FREEBSD-upgrade | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade index 2bd2816..99ce1d9 100644 --- a/contrib/cvs/FREEBSD-upgrade +++ b/contrib/cvs/FREEBSD-upgrade @@ -11,8 +11,6 @@ To prepare a new cvs dist for import, extract it into a fresh directory; The following generated files were deleted: doc/*.ps doc/*.info* -doc/*.aux* -doc/CVSvn.texi doc/texinfo.tex lib/getdate.c cvsnt.* @@ -21,6 +19,7 @@ build.com */*.com */*.dsp */.cvsignore +.cvsignore README.VMS The following non-freebsd-specific directories were deleted: @@ -31,13 +30,13 @@ vms zlib It is imported from it's top level directory something like this: - cvs -n import src/contrib/cvs CYCLIC v<version> + cvs -n import src/contrib/cvs CVSHOME v<version> The -n option is "dont 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 CYCLIC v1_8_1 + cvs import src/contrib/cvs CVSHOME v1_8_1 When new versions are imported, cvs will give instructions on how to merge the local and vendor changes when/if conflicts arise.. |
