summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/FREEBSD-upgrade
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-12-11 13:11:47 +0000
committerpeter <peter@FreeBSD.org>1999-12-11 13:11:47 +0000
commitd47f395242a6bb45422df51a2095873caa50b7f9 (patch)
treec56d93914e22d15e16a704386a6e187c9608c7f9 /contrib/cvs/FREEBSD-upgrade
parentaab6aeadd4dbf9718f16e2c79a3c4253d2e17a04 (diff)
downloadFreeBSD-src-d47f395242a6bb45422df51a2095873caa50b7f9.zip
FreeBSD-src-d47f395242a6bb45422df51a2095873caa50b7f9.tar.gz
Update for 1.10.7 update.
Diffstat (limited to 'contrib/cvs/FREEBSD-upgrade')
-rw-r--r--contrib/cvs/FREEBSD-upgrade18
1 files changed, 6 insertions, 12 deletions
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index 9138048..d40330c 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -14,36 +14,30 @@ doc/*.info*
doc/*.aux*
doc/CVSvn.texi
lib/getdate.c
-tools/pcl-cvs/*.ps
-tools/pcl-cvs/*.aux
-tools/pcl-cvs/texinfo.tex
cvsnt.*
cvs.spec
build.com
-src/build_src.com
-lib/build_lib.com
-diff/build_diff.com
+*/*.com
+*/*.dsp
+.cvsignore
+*/.cvsignore
README.VMS
The following non-freebsd-specific directories were deleted:
-macintosh
os2
emx
windows-NT
vms
-contrib/elib (this has a .tar.Z in it)
zlib
-CVS has RCS Id, Name and Header tags. It needs to be imported with -ko.
-
It is imported from it's top level directory something like this:
- cvs -n import -ko src/contrib/cvs CYCLIC v<version>
+ cvs -n import src/contrib/cvs CYCLIC 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 -ko src/contrib/cvs CYCLIC v1_8_1
+ cvs import src/contrib/cvs CYCLIC 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..
OpenPOWER on IntegriCloud