From owner-cvs-all  Sun Sep  1 22:57:22 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 89F7937B401; Sun,  1 Sep 2002 22:57:15 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E57BC43E77; Sun,  1 Sep 2002 22:57:14 -0700 (PDT)
	(envelope-from peter@FreeBSD.org)
Received: from freefall.freebsd.org (peter@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g825vEJU052526;
	Sun, 1 Sep 2002 22:57:14 -0700 (PDT)
	(envelope-from peter@freefall.freebsd.org)
Received: (from peter@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g825vE9L052525;
	Sun, 1 Sep 2002 22:57:14 -0700 (PDT)
Message-Id: <200209020557.g825vE9L052525@freefall.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 1 Sep 2002 22:57:14 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/cvs/contrib sccs2rcs.in src/contrib/cvs/diff
         diff3.c src/contrib/cvs/man cvs.1 src/contrib/cvs/src checkout.c
         client.c commit.c cvs.h diff.c filesubr.c import.c lock.c login.c
         logmsg.c main.c mkmodules.c rcs.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       2002/09/01 22:57:14 PDT

  Modified files:
    contrib/cvs/contrib  sccs2rcs.in 
    contrib/cvs/diff     diff3.c 
    contrib/cvs/man      cvs.1 
    contrib/cvs/src      checkout.c client.c commit.c cvs.h diff.c 
                         filesubr.c import.c lock.c login.c 
                         logmsg.c main.c mkmodules.c rcs.c 
                         recurse.c server.c update.c 
  Log:
  Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline
  
  Revision  Changes    Path
  1.4       +7 -8      src/contrib/cvs/contrib/sccs2rcs.in
  1.5       +4 -4      src/contrib/cvs/diff/diff3.c
  1.19      +21 -6     src/contrib/cvs/man/cvs.1
  1.3       +104 -26   src/contrib/cvs/src/checkout.c
  1.8       +379 -374  src/contrib/cvs/src/client.c
  1.11      +6 -10     src/contrib/cvs/src/commit.c
  1.15      +14 -24    src/contrib/cvs/src/cvs.h
  1.17      +86 -38    src/contrib/cvs/src/diff.c
  1.9       +2 -3      src/contrib/cvs/src/filesubr.c
  1.10      +14 -11    src/contrib/cvs/src/import.c
  1.10      +12 -1     src/contrib/cvs/src/lock.c
  1.6       +12 -4     src/contrib/cvs/src/login.c
  1.10      +103 -59   src/contrib/cvs/src/logmsg.c
  1.21      +6 -4      src/contrib/cvs/src/main.c
  1.12      +12 -2     src/contrib/cvs/src/mkmodules.c
  1.23      +198 -53   src/contrib/cvs/src/rcs.c
  1.9       +4 -1      src/contrib/cvs/src/recurse.c
  1.16      +102 -76   src/contrib/cvs/src/server.c
  1.10      +11 -11    src/contrib/cvs/src/update.c

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