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