From owner-cvs-all Sun Oct 1 23:34:29 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 94EC337B66D; Sun, 1 Oct 2000 23:34:19 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id XAA06505; Sun, 1 Oct 2000 23:34:19 -0700 (PDT) (envelope-from peter@FreeBSD.org) Message-Id: <200010020634.XAA06505@freefall.freebsd.org> From: Peter Wemm Date: Sun, 1 Oct 2000 23:34:19 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/cvs - Imported sources X-FreeBSD-CVS-Branch: Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG peter 2000/10/01 23:34:19 PDT src/contrib/cvs - Imported sources Update of /home/ncvs/src/contrib/cvs In directory freefall.freebsd.org:/c/tmp/cvs-serv4090 Log Message: Import cvs-1.11 onto vendor branch. Status: Vendor Tag: CYCLIC Release Tags: v1_11 U src/contrib/cvs/COPYING U src/contrib/cvs/COPYING.LIB U src/contrib/cvs/INSTALL U src/contrib/cvs/README U src/contrib/cvs/TODO U src/contrib/cvs/PROJECTS U src/contrib/cvs/BUGS U src/contrib/cvs/MINOR-BUGS U src/contrib/cvs/FAQ U src/contrib/cvs/HACKING U src/contrib/cvs/DEVEL-CVS U src/contrib/cvs/TESTS U src/contrib/cvs/ChangeLog U src/contrib/cvs/NEWS U src/contrib/cvs/ChangeLog.zoo U src/contrib/cvs/configure U src/contrib/cvs/configure.in U src/contrib/cvs/stamp-h.in U src/contrib/cvs/config.h.in U src/contrib/cvs/Makefile.in U src/contrib/cvs/acconfig.h U src/contrib/cvs/cvs-format.el U src/contrib/cvs/mkinstalldirs U src/contrib/cvs/install-sh U src/contrib/cvs/lib/ChangeLog U src/contrib/cvs/lib/ChangeLog.fsf U src/contrib/cvs/lib/Makefile.in U src/contrib/cvs/lib/argmatch.c U src/contrib/cvs/lib/dup2.c U src/contrib/cvs/lib/fncase.c U src/contrib/cvs/lib/fnmatch.c U src/contrib/cvs/lib/ftruncate.c U src/contrib/cvs/lib/getdate.y U src/contrib/cvs/lib/getline.c U src/contrib/cvs/lib/getopt.c U src/contrib/cvs/lib/getopt1.c U src/contrib/cvs/lib/hostname.c U src/contrib/cvs/lib/md5.c U src/contrib/cvs/lib/memmove.c U src/contrib/cvs/lib/mkdir.c U src/contrib/cvs/lib/regex.c U src/contrib/cvs/lib/rename.c U src/contrib/cvs/lib/savecwd.c U src/contrib/cvs/lib/sighandle.c U src/contrib/cvs/lib/strstr.c U src/contrib/cvs/lib/strerror.c U src/contrib/cvs/lib/strtoul.c U src/contrib/cvs/lib/stripslash.c U src/contrib/cvs/lib/valloc.c U src/contrib/cvs/lib/waitpid.c U src/contrib/cvs/lib/xgetwd.c U src/contrib/cvs/lib/yesno.c U src/contrib/cvs/lib/getline.h U src/contrib/cvs/lib/getopt.h U src/contrib/cvs/lib/fnmatch.h U src/contrib/cvs/lib/regex.h U src/contrib/cvs/lib/system.h U src/contrib/cvs/lib/wait.h U src/contrib/cvs/lib/md5.h U src/contrib/cvs/lib/savecwd.h U src/contrib/cvs/diff/diff.c C src/contrib/cvs/diff/diff3.c U src/contrib/cvs/diff/analyze.c U src/contrib/cvs/diff/cmpbuf.c U src/contrib/cvs/diff/cmpbuf.h U src/contrib/cvs/diff/io.c U src/contrib/cvs/diff/context.c U src/contrib/cvs/diff/ed.c U src/contrib/cvs/diff/normal.c U src/contrib/cvs/diff/ifdef.c U src/contrib/cvs/diff/util.c U src/contrib/cvs/diff/dir.c U src/contrib/cvs/diff/version.c U src/contrib/cvs/diff/diff.h U src/contrib/cvs/diff/side.c U src/contrib/cvs/diff/system.h U src/contrib/cvs/diff/diffrun.h U src/contrib/cvs/diff/ChangeLog U src/contrib/cvs/diff/Makefile.in U src/contrib/cvs/diff/diagmeet.note U src/contrib/cvs/src/Makefile.in U src/contrib/cvs/src/ChangeLog U src/contrib/cvs/src/ChangeLog-97 U src/contrib/cvs/src/ChangeLog-96 U src/contrib/cvs/src/ChangeLog-9395 U src/contrib/cvs/src/ChangeLog-9194 U src/contrib/cvs/src/sanity.sh U src/contrib/cvs/src/cvsbug.sh U src/contrib/cvs/src/buffer.h C src/contrib/cvs/src/cvs.h C src/contrib/cvs/src/rcs.h U src/contrib/cvs/src/hardlink.h U src/contrib/cvs/src/hash.h U src/contrib/cvs/src/myndbm.h U src/contrib/cvs/src/update.h U src/contrib/cvs/src/server.h U src/contrib/cvs/src/client.h U src/contrib/cvs/src/error.h U src/contrib/cvs/src/fileattr.h U src/contrib/cvs/src/edit.h U src/contrib/cvs/src/watch.h U src/contrib/cvs/src/options.h.in U src/contrib/cvs/src/add.c U src/contrib/cvs/src/admin.c U src/contrib/cvs/src/buffer.c U src/contrib/cvs/src/checkin.c U src/contrib/cvs/src/checkout.c U src/contrib/cvs/src/classify.c C src/contrib/cvs/src/client.c C src/contrib/cvs/src/commit.c U src/contrib/cvs/src/create_adm.c U src/contrib/cvs/src/cvsrc.c U src/contrib/cvs/src/diff.c U src/contrib/cvs/src/edit.c U src/contrib/cvs/src/entries.c U src/contrib/cvs/src/error.c U src/contrib/cvs/src/expand_path.c U src/contrib/cvs/src/fileattr.c U src/contrib/cvs/src/find_names.c U src/contrib/cvs/src/hardlink.c U src/contrib/cvs/src/hash.c U src/contrib/cvs/src/history.c U src/contrib/cvs/src/ignore.c C src/contrib/cvs/src/import.c C src/contrib/cvs/src/lock.c U src/contrib/cvs/src/log.c C src/contrib/cvs/src/login.c C src/contrib/cvs/src/logmsg.c C src/contrib/cvs/src/main.c C src/contrib/cvs/src/mkmodules.c U src/contrib/cvs/src/patch.c U src/contrib/cvs/src/modules.c U src/contrib/cvs/src/myndbm.c U src/contrib/cvs/src/no_diff.c U src/contrib/cvs/src/parseinfo.c C src/contrib/cvs/src/rcs.c U src/contrib/cvs/src/rcscmds.c C src/contrib/cvs/src/recurse.c U src/contrib/cvs/src/release.c U src/contrib/cvs/src/remove.c U src/contrib/cvs/src/repos.c U src/contrib/cvs/src/root.c U src/contrib/cvs/src/rtag.c U src/contrib/cvs/src/scramble.c C src/contrib/cvs/src/server.c U src/contrib/cvs/src/status.c U src/contrib/cvs/src/subr.c C src/contrib/cvs/src/filesubr.c U src/contrib/cvs/src/run.c U src/contrib/cvs/src/tag.c C src/contrib/cvs/src/update.c U src/contrib/cvs/src/watch.c U src/contrib/cvs/src/wrapper.c U src/contrib/cvs/src/vers_ts.c U src/contrib/cvs/src/version.c U src/contrib/cvs/src/zlib.c U src/contrib/cvs/man/ChangeLog U src/contrib/cvs/man/Makefile.in C src/contrib/cvs/man/cvs.1 U src/contrib/cvs/man/cvs.5 C src/contrib/cvs/man/cvsbug.8 U src/contrib/cvs/doc/ChangeLog U src/contrib/cvs/doc/ChangeLog.fsf U src/contrib/cvs/doc/Makefile.in U src/contrib/cvs/doc/RCSFILES U src/contrib/cvs/doc/cvs-paper.ms U src/contrib/cvs/doc/cvs.texinfo U src/contrib/cvs/doc/cvsclient.texi U src/contrib/cvs/contrib/ChangeLog U src/contrib/cvs/contrib/README U src/contrib/cvs/contrib/intro.doc U src/contrib/cvs/contrib/Makefile.in U src/contrib/cvs/contrib/clmerge.pl U src/contrib/cvs/contrib/cln_hist.pl U src/contrib/cvs/contrib/commit_prep.pl U src/contrib/cvs/contrib/cvs2vendor.sh U src/contrib/cvs/contrib/cvs_acls.pl U src/contrib/cvs/contrib/cvscheck.sh U src/contrib/cvs/contrib/cvscheck.man U src/contrib/cvs/contrib/cvshelp.man U src/contrib/cvs/contrib/descend.sh U src/contrib/cvs/contrib/descend.man U src/contrib/cvs/contrib/dirfns.shar C src/contrib/cvs/contrib/log.pl U src/contrib/cvs/contrib/log_accum.pl U src/contrib/cvs/contrib/mfpipe.pl U src/contrib/cvs/contrib/rcs-to-cvs.sh U src/contrib/cvs/contrib/rcs2log.sh U src/contrib/cvs/contrib/rcslock.pl C src/contrib/cvs/contrib/sccs2rcs.csh U src/contrib/cvs/contrib/rcs2sccs.sh U src/contrib/cvs/tools/ChangeLog U src/contrib/cvs/tools/README U src/contrib/cvs/tools/Makefile.in 20 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCYCLIC:yesterday -jCYCLIC src/contrib/cvs To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message