From owner-cvs-all  Fri Aug 10  2:53:13 2001
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 6AA7437B405; Fri, 10 Aug 2001 02:53:07 -0700 (PDT)
	(envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f7A9r7S62095;
	Fri, 10 Aug 2001 02:53:07 -0700 (PDT)
	(envelope-from peter)
Message-Id: <200108100953.f7A9r7S62095@freefall.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 10 Aug 2001 02:53:07 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/cvs/diff diff3.c src/contrib/cvs/src
         client.c commit.c cvs.h diff.c filesubr.c import.c lock.c login.c
         logmsg.c main.c mkmodules.c rcs.c rcs.h rcscmds.c recurse.c
         server.c update.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

peter       2001/08/10 02:53:07 PDT

  Modified files:
    contrib/cvs/diff     diff3.c 
    contrib/cvs/src      client.c commit.c cvs.h diff.c filesubr.c 
                         import.c lock.c login.c logmsg.c main.c 
                         mkmodules.c rcs.c rcs.h rcscmds.c 
                         recurse.c server.c update.c 
  Log:
  Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline.  There is
  still some suspicious and/or broken stuff to fix yet.
  
  Revision  Changes    Path
  1.4       +45 -24    src/contrib/cvs/diff/diff3.c
  1.5       +219 -126  src/contrib/cvs/src/client.c
  1.10      +37 -49    src/contrib/cvs/src/commit.c
  1.13      +37 -21    src/contrib/cvs/src/cvs.h
  1.15      +58 -60    src/contrib/cvs/src/diff.c
  1.8       +172 -71   src/contrib/cvs/src/filesubr.c
  1.9       +15 -15    src/contrib/cvs/src/import.c
  1.9       +13 -11    src/contrib/cvs/src/lock.c
  1.5       +454 -304  src/contrib/cvs/src/login.c
  1.8       +17 -20    src/contrib/cvs/src/logmsg.c
  1.20      +111 -114  src/contrib/cvs/src/main.c
  1.11      +5 -7      src/contrib/cvs/src/mkmodules.c
  1.22      +51 -197   src/contrib/cvs/src/rcs.c
  1.9       +9 -4      src/contrib/cvs/src/rcs.h
  1.8       +8 -2      src/contrib/cvs/src/rcscmds.c
  1.8       +14 -12    src/contrib/cvs/src/recurse.c
  1.15      +287 -162  src/contrib/cvs/src/server.c
  1.8       +90 -43    src/contrib/cvs/src/update.c


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message