From owner-cvs-contrib Thu May 15 15:47:49 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA22423 for cvs-contrib-outgoing; Thu, 15 May 1997 15:47:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA22401; Thu, 15 May 1997 15:47:39 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA23673; Thu, 15 May 1997 15:46:25 -0700 (PDT) Date: Thu, 15 May 1997 15:46:25 -0700 (PDT) Message-Id: <199705152246.PAA23673@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs - Imported sources Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/15 15:46:25 PDT src/contrib/cvs - Imported sources Update of /home/ncvs/src/contrib/cvs In directory freefall.freebsd.org:/c/peter/cvsimp Revision/Branch: 1.1.1 Log Message: Import of cvs-1.9.9-970515 onto vendor branch. Obtained from: cyclic.com Status: Vendor Tag: CYCLIC Release Tags: v1_9_9_970515 U src/contrib/cvs/config.h.in U src/contrib/cvs/acconfig.h U src/contrib/cvs/TODO N src/contrib/cvs/TESTS N src/contrib/cvs/README.VMS U src/contrib/cvs/README U src/contrib/cvs/PROJECTS U src/contrib/cvs/NEWS U src/contrib/cvs/Makefile.in U src/contrib/cvs/MINOR-BUGS U src/contrib/cvs/INSTALL U src/contrib/cvs/HACKING U src/contrib/cvs/FAQ N src/contrib/cvs/DEVEL-CVS U src/contrib/cvs/ChangeLog.zoo U src/contrib/cvs/ChangeLog U src/contrib/cvs/COPYING.LIB U src/contrib/cvs/COPYING U src/contrib/cvs/BUGS U src/contrib/cvs/stamp-h.in U src/contrib/cvs/mkinstalldirs U src/contrib/cvs/install-sh U src/contrib/cvs/cvs-format.el U src/contrib/cvs/configure.in U src/contrib/cvs/configure U src/contrib/cvs/tools/Makefile.in U src/contrib/cvs/tools/README U src/contrib/cvs/tools/ChangeLog U src/contrib/cvs/tools/pcl-cvs/ChangeLog N src/contrib/cvs/tools/pcl-cvs/ChangeLog.woods U src/contrib/cvs/tools/pcl-cvs/INSTALL U src/contrib/cvs/tools/pcl-cvs/Makefile.in U src/contrib/cvs/tools/pcl-cvs/NEWS U src/contrib/cvs/tools/pcl-cvs/README N src/contrib/cvs/tools/pcl-cvs/ToDo U src/contrib/cvs/tools/pcl-cvs/pcl-cvs-lucid.el U src/contrib/cvs/tools/pcl-cvs/pcl-cvs-startup.el U src/contrib/cvs/tools/pcl-cvs/pcl-cvs.el U src/contrib/cvs/tools/pcl-cvs/pcl-cvs.texinfo U src/contrib/cvs/doc/ChangeLog.fsf U src/contrib/cvs/doc/ChangeLog U src/contrib/cvs/doc/cvs.texinfo U src/contrib/cvs/doc/Makefile.in U src/contrib/cvs/doc/cvs-paper.ms U src/contrib/cvs/doc/cvsclient.texi N src/contrib/cvs/doc/RCSFILES N src/contrib/cvs/doc/DIFFUTILS-2.7-BUG U src/contrib/cvs/src/Makefile.in U src/contrib/cvs/src/ChangeLog U src/contrib/cvs/src/fileattr.c U src/contrib/cvs/src/admin.c C src/contrib/cvs/src/mkmodules.c U src/contrib/cvs/src/add.c U src/contrib/cvs/src/checkin.c U src/contrib/cvs/src/checkout.c U src/contrib/cvs/src/login.c U src/contrib/cvs/src/classify.c U src/contrib/cvs/src/client.c U src/contrib/cvs/src/client.h U src/contrib/cvs/src/commit.c U src/contrib/cvs/src/create_adm.c U src/contrib/cvs/src/cvs.h U src/contrib/cvs/src/cvsbug.sh U src/contrib/cvs/src/cvsrc.c C src/contrib/cvs/src/diff.c U src/contrib/cvs/src/entries.c U src/contrib/cvs/src/filesubr.c U src/contrib/cvs/src/find_names.c U src/contrib/cvs/src/hash.c U src/contrib/cvs/src/hash.h U src/contrib/cvs/src/patch.c U src/contrib/cvs/src/history.c U src/contrib/cvs/src/lock.c U src/contrib/cvs/src/ignore.c U src/contrib/cvs/src/import.c U src/contrib/cvs/src/log.c U src/contrib/cvs/src/logmsg.c C src/contrib/cvs/src/main.c U src/contrib/cvs/src/modules.c U src/contrib/cvs/src/myndbm.c U src/contrib/cvs/src/myndbm.h U src/contrib/cvs/src/no_diff.c U src/contrib/cvs/src/edit.c U src/contrib/cvs/src/parseinfo.c U src/contrib/cvs/src/repos.c U src/contrib/cvs/src/watch.c C src/contrib/cvs/src/rcs.c U src/contrib/cvs/src/rcs.h U src/contrib/cvs/src/rcscmds.c U 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/root.c U src/contrib/cvs/src/rtag.c U src/contrib/cvs/src/run.c U src/contrib/cvs/src/edit.h U src/contrib/cvs/src/subr.c U src/contrib/cvs/src/sanity.sh U src/contrib/cvs/src/server.c U src/contrib/cvs/src/server.h U src/contrib/cvs/src/status.c U src/contrib/cvs/src/tag.c U src/contrib/cvs/src/update.c U src/contrib/cvs/src/update.h U src/contrib/cvs/src/vers_ts.c U src/contrib/cvs/src/version.c U src/contrib/cvs/src/wrapper.c U src/contrib/cvs/src/expand_path.c U src/contrib/cvs/src/error.c U src/contrib/cvs/src/error.h U src/contrib/cvs/src/watch.h U src/contrib/cvs/src/options.h.in U src/contrib/cvs/src/fileattr.h U src/contrib/cvs/src/scramble.c N src/contrib/cvs/src/buffer.h U src/contrib/cvs/src/ChangeLog-9194 U src/contrib/cvs/src/ChangeLog-9395 N src/contrib/cvs/src/ChangeLog-96 N src/contrib/cvs/src/buffer.c N src/contrib/cvs/src/zlib.c U src/contrib/cvs/contrib/ChangeLog N src/contrib/cvs/contrib/ccvs-rsh.pl U src/contrib/cvs/contrib/README U src/contrib/cvs/contrib/cln_hist.pl U src/contrib/cvs/contrib/clmerge.pl U src/contrib/cvs/contrib/commit_prep.pl U src/contrib/cvs/contrib/cvs_acls.pl U src/contrib/cvs/contrib/cvscheck.man U src/contrib/cvs/contrib/cvscheck.sh U src/contrib/cvs/contrib/cvshelp.man U src/contrib/cvs/contrib/descend.man U src/contrib/cvs/contrib/descend.sh U src/contrib/cvs/contrib/dirfns.shar U src/contrib/cvs/contrib/intro.doc U 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/rcs2sccs.sh U src/contrib/cvs/contrib/rcslock.pl U src/contrib/cvs/contrib/sccs2rcs.csh N src/contrib/cvs/contrib/listen2.c N src/contrib/cvs/contrib/cvs2vendor.sh N src/contrib/cvs/contrib/listen2.mak U src/contrib/cvs/contrib/Makefile.in U src/contrib/cvs/man/Makefile.in U src/contrib/cvs/man/ChangeLog U src/contrib/cvs/man/cvsbug.8 C src/contrib/cvs/man/cvs.1 U src/contrib/cvs/man/cvs.5 U src/contrib/cvs/lib/ChangeLog.fsf U src/contrib/cvs/lib/ChangeLog U src/contrib/cvs/lib/sighandle.c 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/fnmatch.c U src/contrib/cvs/lib/fnmatch.h U src/contrib/cvs/lib/ftruncate.c U src/contrib/cvs/lib/getdate.y U src/contrib/cvs/lib/getopt.c U src/contrib/cvs/lib/getopt.h U src/contrib/cvs/lib/getopt1.c U src/contrib/cvs/lib/getwd.c U src/contrib/cvs/lib/hostname.c U src/contrib/cvs/lib/md5.c U src/contrib/cvs/lib/md5.h U src/contrib/cvs/lib/vasprintf.c U src/contrib/cvs/lib/mkdir.c U src/contrib/cvs/lib/regex.c U src/contrib/cvs/lib/regex.h U src/contrib/cvs/lib/rename.c U src/contrib/cvs/lib/yesno.c U src/contrib/cvs/lib/strdup.c U src/contrib/cvs/lib/strerror.c U src/contrib/cvs/lib/wait.h U src/contrib/cvs/lib/stripslash.c U src/contrib/cvs/lib/system.h 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/getline.c U src/contrib/cvs/lib/getline.h U src/contrib/cvs/lib/strstr.c U src/contrib/cvs/lib/savecwd.c U src/contrib/cvs/lib/savecwd.h U src/contrib/cvs/lib/strtoul.c 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCYCLIC:yesterday -jCYCLIC src/contrib/cvs From owner-cvs-contrib Thu May 15 15:53:57 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA22793 for cvs-contrib-outgoing; Thu, 15 May 1997 15:53:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA22759; Thu, 15 May 1997 15:53:40 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA24021; Thu, 15 May 1997 15:52:26 -0700 (PDT) Date: Thu, 15 May 1997 15:52:26 -0700 (PDT) Message-Id: <199705152252.PAA24021@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/man cvs.1 src/contrib/cvs/src diff.c main.c mkmodules.c rcs.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/15 15:52:26 PDT Modified files: contrib/cvs/man cvs.1 Log: Merge conflicts Revision Changes Path 1.6 +22 -32 src/contrib/cvs/man/cvs.1 Modified files: contrib/cvs/src diff.c main.c mkmodules.c rcs.c Log: Merge import conflicts Revision Changes Path 1.4 +453 -169 src/contrib/cvs/src/diff.c 1.3 +547 -453 src/contrib/cvs/src/main.c 1.3 +152 -81 src/contrib/cvs/src/mkmodules.c 1.3 +2443 -439 src/contrib/cvs/src/rcs.c From owner-cvs-contrib Thu May 15 15:57:58 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA22993 for cvs-contrib-outgoing; Thu, 15 May 1997 15:57:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA22956; Thu, 15 May 1997 15:57:43 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA24063; Thu, 15 May 1997 15:56:29 -0700 (PDT) Date: Thu, 15 May 1997 15:56:29 -0700 (PDT) Message-Id: <199705152256.PAA24063@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/man cvs.1 Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/15 15:56:29 PDT Modified files: contrib/cvs/man cvs.1 Log: Delete extranious $Id$ - it's not expanded on -ko files Revision Changes Path 1.7 +0 -2 src/contrib/cvs/man/cvs.1 From owner-cvs-contrib Thu May 15 16:12:28 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id QAA23798 for cvs-contrib-outgoing; Thu, 15 May 1997 16:12:28 -0700 (PDT) Received: from agora.rdrop.com (root@agora.rdrop.com [199.2.210.241]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id QAA23781; Thu, 15 May 1997 16:12:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by agora.rdrop.com (8.8.5/8.8.5) with ESMTP id QAA26978; Thu, 15 May 1997 16:11:51 -0700 (PDT) From: peter@FreeBSD.ORG Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id QAA24811; Thu, 15 May 1997 16:10:28 -0700 (PDT) Date: Thu, 15 May 1997 16:10:28 -0700 (PDT) Message-Id: <199705152310.QAA24811@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs FREEBSD-upgrade Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/15 16:10:28 PDT Modified files: contrib/cvs FREEBSD-upgrade Log: Update Revision Changes Path 1.2 +7 -0 src/contrib/cvs/FREEBSD-upgrade From owner-cvs-contrib Thu May 15 17:14:12 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id RAA26360 for cvs-contrib-outgoing; Thu, 15 May 1997 17:14:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id RAA26323; Thu, 15 May 1997 17:13:31 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA25315; Thu, 15 May 1997 17:12:17 -0700 (PDT) Date: Thu, 15 May 1997 17:12:17 -0700 (PDT) Message-Id: <199705160012.RAA25315@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src cvs.h main.c rcs.c server.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/15 17:12:17 PDT Modified files: contrib/cvs/src cvs.h main.c rcs.c server.c Log: Initial round of support for a local $Id$ keyword in cvs, eg: $FreeBSD$. This is not complete yet in that it doesn't drive our version of RCS completely, but it does work fine when you do the appropriate magic. Obtained from: OpenBSD source tree Revision Changes Path 1.2 +307 -172 src/contrib/cvs/src/cvs.h 1.4 +82 -0 src/contrib/cvs/src/main.c 1.4 +10 -2 src/contrib/cvs/src/rcs.c 1.2 +3777 -3136src/contrib/cvs/src/server.c From owner-cvs-contrib Thu May 15 18:49:26 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id SAA00487 for cvs-contrib-outgoing; Thu, 15 May 1997 18:49:26 -0700 (PDT) Received: from silvia.HIP.Berkeley.EDU (ala-ca26-17.ix.netcom.com [207.93.42.81]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id SAA00442; Thu, 15 May 1997 18:48:10 -0700 (PDT) Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.5/8.6.9) id SAA10456; Thu, 15 May 1997 18:47:17 -0700 (PDT) Date: Thu, 15 May 1997 18:47:17 -0700 (PDT) Message-Id: <199705160147.SAA10456@silvia.HIP.Berkeley.EDU> To: peter@FreeBSD.ORG CC: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG In-reply-to: <199705160012.RAA25315@freefall.freebsd.org> (message from Peter Wemm on Thu, 15 May 1997 17:12:17 -0700 (PDT)) Subject: Re: cvs commit: src/contrib/cvs/src cvs.h main.c rcs.c server.c From: asami@vader.cs.berkeley.edu (Satoshi Asami) Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk * 1.2 +3777 -3136src/contrib/cvs/src/server.c ^^^^^^^^^^^ Are you really serious??? (Or is this another bug in the new commit script? :) Satoshi From owner-cvs-contrib Thu May 15 19:02:09 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id TAA00900 for cvs-contrib-outgoing; Thu, 15 May 1997 19:02:09 -0700 (PDT) Received: from spinner.DIALix.COM (spinner.dialix.com [192.203.228.67]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id TAA00880; Thu, 15 May 1997 19:01:40 -0700 (PDT) Received: from spinner.DIALix.COM (localhost.dialix.com.au [127.0.0.1]) by spinner.DIALix.COM with ESMTP id KAA06324; Fri, 16 May 1997 10:00:59 +0800 (WST) Message-Id: <199705160200.KAA06324@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: asami@vader.cs.berkeley.edu (Satoshi Asami) cc: peter@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/cvs/src cvs.h main.c rcs.c server.c In-reply-to: Your message of "Thu, 15 May 1997 18:47:17 MST." <199705160147.SAA10456@silvia.HIP.Berkeley.EDU> Date: Fri, 16 May 1997 10:00:58 +0800 From: Peter Wemm Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Satoshi Asami wrote: > * 1.2 +3777 -3136src/contrib/cvs/src/server.c > ^^^^^^^^^^^ > > Are you really serious??? (Or is this another bug in the new commit > script? :) No, Unfortunately, the numbers are a correct indication of what went into the rcs file to store this one-line delta. This is a graphic example of how badly the rcs file format sucks. This one line addition is stored as a delta relative to 1.1.1.1, not 1.1.1.2. ---------------------------- revision 1.2 date: 1997/05/16 00:12:16; author: peter; state: Exp; lines: +3777 -3136 ^^^^^^^^^^^ Initial round of support for a local $Id$ keyword in cvs, eg: $FreeBSD$. This is not complete yet in that it doesn't drive our version of RCS completely, but it does work fine when you do the appropriate magic. Obtained from: OpenBSD source tree ---------------------------- revision 1.1 date: 1996/08/20 23:46:04; author: peter; state: Exp; branches: 1.1.1; Initial revision ---------------------------- revision 1.1.1.2 date: 1997/05/15 22:45:50; author: peter; state: Exp; lines: +3757 -3117 ^^^^^^^^^^^ Import of cvs-1.9.9-970515 onto vendor branch. Obtained from: cyclic.com ---------------------------- revision 1.1.1.1 date: 1996/08/20 23:46:04; author: peter; state: Exp; lines: +0 -0 Import of slightly trimmed cvs-1.8 distribution. Generated files and non-unix code has been left out. ============================================================================= peter@spinner[9:56am]~src/contrib/cvs/src-340> cvs diff -r1.1.1.2 server.c Index: server.c RCS file: /home/ncvs/src/contrib/cvs/src/server.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -r1.1.1.2 -r1.2 567a568 > parseopts(CVSroot_directory); peter@spinner[9:57am]~src/contrib/cvs/src-341> cvs diff -r1.1.1.1 server.c | wc -l 8052 peter@spinner[9:57am]~src/contrib/cvs/src-342> Unfortunately, since it's a fundamental design feature, it's not something that can be fixed without abandoning the rcs file format for branching support (as perforce aka p4 has done). > Satoshi Cheers, -Peter From owner-cvs-contrib Thu May 15 20:04:37 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id UAA03611 for cvs-contrib-outgoing; Thu, 15 May 1997 20:04:37 -0700 (PDT) Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id UAA03523; Thu, 15 May 1997 20:03:25 -0700 (PDT) Received: (from eivind@localhost) by bitbox.follo.net (8.7.6/8.7.3) id FAA29395; Fri, 16 May 1997 05:02:49 +0200 (MET DST) Date: Fri, 16 May 1997 05:02:49 +0200 (MET DST) Message-Id: <199705160302.FAA29395@bitbox.follo.net> From: Eivind Eklund To: Peter Wemm CC: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG In-reply-to: Peter Wemm's message of Thu, 15 May 1997 17:12:17 -0700 (PDT) Subject: Re: cvs commit: src/contrib/cvs/src cvs.h main.c rcs.c server.c References: <199705160012.RAA25315@freefall.freebsd.org> Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > > peter 1997/05/15 17:12:17 PDT > > Modified files: > contrib/cvs/src cvs.h main.c rcs.c server.c > Log: > Initial round of support for a local $Id$ keyword in cvs, eg: $FreeBSD$. > This is not complete yet in that it doesn't drive our version of RCS > completely, but it does work fine when you do the appropriate magic. > > Obtained from: OpenBSD source tree > > Revision Changes Path > 1.2 +307 -172 src/contrib/cvs/src/cvs.h > 1.4 +82 -0 src/contrib/cvs/src/main.c > 1.4 +10 -2 src/contrib/cvs/src/rcs.c > 1.2 +3777 -3136src/contrib/cvs/src/server.c Something is wrong here. The change for server.c is merging all sorts of winsock-stuff, adding GNU license, etc. It looks like this contains all changes done to server.c from the first to the second import of CVS in contrib in addition to what is described in the log entry. And if this is normal behavior for CVS, then there is still something that is wrong, in this case CVS. Eivind. From owner-cvs-contrib Sat May 17 06:41:06 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id GAA24015 for cvs-contrib-outgoing; Sat, 17 May 1997 06:41:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id GAA23983; Sat, 17 May 1997 06:40:13 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id GAA07853; Sat, 17 May 1997 06:38:46 -0700 (PDT) Date: Sat, 17 May 1997 06:38:46 -0700 (PDT) Message-Id: <199705171338.GAA07853@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src main.c rcs.c rcs.h Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/17 06:38:46 PDT Modified files: contrib/cvs/src main.c rcs.c rcs.h Log: Complete the support for $FreeBSD$. Add an option "tagexpand=" which controls the RCSINCEXC encironment variable for our rcs version, and also convert the rest of the checkout enhancements from rcs into cvs's fast checkout code. (yes, cvs doesn't call 'co' anymore) We now have fine grained individual keyword expansion control and can set the keyword to anything the user wants. Also, a new keyword, $CVSHeader$ comes in from rcs, it's like $Header$ except that it shows the pathname relative to the cvsroot. eg: $FreeBSD: src/bin/ls/ls.c,v 1.10.2.14 1997/05/17 13:15:45 peter Exp $ ^^^^^^^^^^^^^^^^^ The idea for this comes from $XFree86$ which expands like $CVSHeader$. The "local id" string can be set to expand like Id, Header or CVSHeader. (Matching support for this is apparently happening in cvsup right now) Revision Changes Path 1.5 +22 -25 src/contrib/cvs/src/main.c 1.5 +123 -20 src/contrib/cvs/src/rcs.c 1.2 +34 -7 src/contrib/cvs/src/rcs.h From owner-cvs-contrib Sat May 17 07:03:12 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id HAA24596 for cvs-contrib-outgoing; Sat, 17 May 1997 07:03:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA24571; Sat, 17 May 1997 07:02:54 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA07986; Sat, 17 May 1997 07:01:26 -0700 (PDT) Date: Sat, 17 May 1997 07:01:26 -0700 (PDT) Message-Id: <199705171401.HAA07986@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src cvs.h lock.c main.c server.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/17 07:01:26 PDT Modified files: contrib/cvs/src cvs.h lock.c main.c server.c Log: Pull in OpenBSD's support for checking out from a read-only repository, such as within an anoncvs server, or from a CDROM repository. Cyclic (the cvs maintainers) do not like this approach and have an alternative read-only system, but that requires a read/write repository to work (which rules out CDROM). Obtained from: OpenBSD Revision Changes Path 1.3 +3 -0 src/contrib/cvs/src/cvs.h 1.2 +329 -172 src/contrib/cvs/src/lock.c 1.6 +6 -1 src/contrib/cvs/src/main.c 1.3 +1 -1 src/contrib/cvs/src/server.c From owner-cvs-contrib Sat May 17 07:06:01 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id HAA24697 for cvs-contrib-outgoing; Sat, 17 May 1997 07:06:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA24670; Sat, 17 May 1997 07:05:46 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA08020; Sat, 17 May 1997 07:04:18 -0700 (PDT) Date: Sat, 17 May 1997 07:04:18 -0700 (PDT) Message-Id: <199705171404.HAA08020@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src lock.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/17 07:04:18 PDT Modified files: contrib/cvs/src lock.c Log: Catch write-lock attempts immediately if running in read-only mode rather than depending on getting a write fail. Revision Changes Path 1.3 +5 -0 src/contrib/cvs/src/lock.c From owner-cvs-contrib Sat May 17 07:15:11 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id HAA24979 for cvs-contrib-outgoing; Sat, 17 May 1997 07:15:11 -0700 (PDT) Received: from spinner.DIALix.COM (spinner.dialix.com [192.203.228.67]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA24963; Sat, 17 May 1997 07:14:39 -0700 (PDT) Received: from spinner.DIALix.COM (localhost.dialix.com.au [127.0.0.1]) by spinner.DIALix.COM with ESMTP id WAA24443; Sat, 17 May 1997 22:14:21 +0800 (WST) Message-Id: <199705171414.WAA24443@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: Peter Wemm cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/cvs/src cvs.h lock.c main.c server.c In-reply-to: Your message of "Sat, 17 May 1997 07:01:26 MST." <199705171401.HAA07986@freefall.freebsd.org> Date: Sat, 17 May 1997 22:14:20 +0800 From: Peter Wemm Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Peter Wemm wrote: > Revision Changes Path > 1.3 +3 -0 src/contrib/cvs/src/cvs.h > 1.2 +329 -172 src/contrib/cvs/src/lock.c ^^^^^^^^^^ Again, this is a one-line change which is stored as a huge delta due to the rcs file format. Sigh... :-( Cheers, -Peter From owner-cvs-contrib Sat May 17 07:16:29 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id HAA25047 for cvs-contrib-outgoing; Sat, 17 May 1997 07:16:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA25025; Sat, 17 May 1997 07:16:15 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA08090; Sat, 17 May 1997 07:14:47 -0700 (PDT) Date: Sat, 17 May 1997 07:14:47 -0700 (PDT) Message-Id: <199705171414.HAA08090@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src rcs.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/17 07:14:47 PDT Modified files: contrib/cvs/src rcs.c Log: use xstrdup rather than strdup in case of malloc failure. Revision Changes Path 1.6 +3 -3 src/contrib/cvs/src/rcs.c From owner-cvs-contrib Sat May 17 07:22:24 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id HAA25223 for cvs-contrib-outgoing; Sat, 17 May 1997 07:22:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id HAA25195; Sat, 17 May 1997 07:22:01 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA08153; Sat, 17 May 1997 07:20:34 -0700 (PDT) Date: Sat, 17 May 1997 07:20:34 -0700 (PDT) Message-Id: <199705171420.HAA08153@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src main.c Sender: owner-cvs-contrib@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/05/17 07:20:34 PDT Modified files: contrib/cvs/src main.c Log: Implement a -R option to cvs to turn on read-only repository mode. When using a local repository that is only written to by CVSup - which I assume doesn't do the cvs locking protocol - this option might be a speedup since cvs will not create lock files. Revision Changes Path 1.7 +6 -1 src/contrib/cvs/src/main.c