From owner-cvs-src@FreeBSD.ORG  Wed Apr 14 18:17:29 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5DA3616A4CE; Wed, 14 Apr 2004 18:17:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3FE0C43D53; Wed, 14 Apr 2004 18:17:29 -0700 (PDT)
	(envelope-from peter@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3F1HTGe011281;
	Wed, 14 Apr 2004 18:17:29 -0700 (PDT)
	(envelope-from peter@repoman.freebsd.org)
Received: (from peter@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3F1HSlI011280;
	Wed, 14 Apr 2004 18:17:28 -0700 (PDT)
	(envelope-from peter)
Message-Id: <200404150117.i3F1HSlI011280@repoman.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 14 Apr 2004 18:17:28 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/cvs/contrib sccs2rcs.insrc/contrib/cvs/diff
 diff3.c src/contrib/cvs/man cvs.1 src/contrib/cvs/src buffer.c
 checkout.c client.c commit.c cvs.h diff.c entries.c filesubr.c...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Apr 2004 01:17:29 -0000

peter       2004/04/14 18:17:28 PDT

  FreeBSD src repository

  Modified files:
    contrib/cvs/contrib  sccs2rcs.in 
    contrib/cvs/diff     diff3.c 
    contrib/cvs/man      cvs.1 
    contrib/cvs/src      buffer.c checkout.c client.c commit.c 
                         cvs.h diff.c entries.c filesubr.c 
                         import.c lock.c login.c logmsg.c main.c 
                         mkmodules.c parseinfo.c rcs.c rcs.h 
                         rcscmds.c recurse.c server.c update.c 
                         update.h 
  Log:
  Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline
  
  Revision  Changes    Path
  1.5       +43 -8     src/contrib/cvs/contrib/sccs2rcs.in
  1.6       +1 -0      src/contrib/cvs/diff/diff3.c
  1.21      +6 -22     src/contrib/cvs/man/cvs.1
  1.5       +72 -42    src/contrib/cvs/src/buffer.c
  1.5       +104 -74   src/contrib/cvs/src/checkout.c
  1.11      +660 -662  src/contrib/cvs/src/client.c
  1.14      +331 -382  src/contrib/cvs/src/commit.c
  1.18      +123 -104  src/contrib/cvs/src/cvs.h
  1.20      +251 -185  src/contrib/cvs/src/diff.c
  1.3       +27 -26    src/contrib/cvs/src/entries.c
  1.11      +78 -134   src/contrib/cvs/src/filesubr.c
  1.12      +41 -29    src/contrib/cvs/src/import.c
  1.13      +113 -57   src/contrib/cvs/src/lock.c
  1.8       +23 -20    src/contrib/cvs/src/login.c
  1.12      +41 -35    src/contrib/cvs/src/logmsg.c
  1.24      +34 -27    src/contrib/cvs/src/main.c
  1.13      +11 -9     src/contrib/cvs/src/mkmodules.c
  1.3       +35 -25    src/contrib/cvs/src/parseinfo.c
  1.26      +314 -259  src/contrib/cvs/src/rcs.c
  1.10      +27 -22    src/contrib/cvs/src/rcs.h
  1.10      +78 -63    src/contrib/cvs/src/rcscmds.c
  1.12      +77 -25    src/contrib/cvs/src/recurse.c
  1.21      +545 -544  src/contrib/cvs/src/server.c
  1.13      +207 -163  src/contrib/cvs/src/update.c
  1.3       +2 -2      src/contrib/cvs/src/update.h