From owner-cvs-contrib  Sun Jan 25 19:24:55 1998
Return-Path: <owner-cvs-contrib>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id TAA25919
          for cvs-contrib-outgoing; Sun, 25 Jan 1998 19:24:55 -0800 (PST)
          (envelope-from owner-cvs-contrib)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id TAA25891;
          Sun, 25 Jan 1998 19:24:50 -0800 (PST)
          (envelope-from peter@FreeBSD.org)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id TAA22057;
	Sun, 25 Jan 1998 19:24:15 -0800 (PST)
Date: Sun, 25 Jan 1998 19:24:15 -0800 (PST)
Message-Id: <199801260324.TAA22057@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/cvs/src commit.c cvs.h diff.c import.c
         lock.c logmsg.c main.c mkmodules.c recurse.c server.c update.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1998/01/25 19:24:14 PST

  Modified files:
    contrib/cvs/src      commit.c cvs.h diff.c import.c lock.c 
                         logmsg.c main.c mkmodules.c recurse.c 
                         server.c update.c 
  Log:
  Merge changes from CYCLIC branch onto mainline.  rcs.[ch] still to come.
  
  Revision  Changes    Path
  1.4       +158 -38   src/contrib/cvs/src/commit.c
  1.6       +73 -45    src/contrib/cvs/src/cvs.h
  1.9       +103 -41   src/contrib/cvs/src/diff.c
  1.4       +203 -122  src/contrib/cvs/src/import.c
  1.5       +4 -4      src/contrib/cvs/src/lock.c
  1.3       +19 -9     src/contrib/cvs/src/logmsg.c
  1.10      +172 -108  src/contrib/cvs/src/main.c
  1.5       +34 -10    src/contrib/cvs/src/mkmodules.c
  1.3       +89 -3     src/contrib/cvs/src/recurse.c
  1.5       +815 -394  src/contrib/cvs/src/server.c
  1.3       +234 -108  src/contrib/cvs/src/update.c