From owner-cvs-src@FreeBSD.ORG  Wed Jan 28 09:44:20 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 181EF16A4CE; Wed, 28 Jan 2004 09:44:20 -0800 (PST)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BC4C543D1F; Wed, 28 Jan 2004 09:44:16 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.10/8.12.9) with ESMTP id i0SHiEA0074890;
	Wed, 28 Jan 2004 09:44:14 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.10/8.12.10/Submit) id i0SHiEO0074889;
	Wed, 28 Jan 2004 09:44:14 -0800 (PST)
	(envelope-from obrien)
Date: Wed, 28 Jan 2004 09:44:13 -0800
From: "David O'Brien" <obrien@FreeBSD.org>
To: "Jacques A. Vidrine" <nectar@FreeBSD.org>
Message-ID: <20040128174413.GA74224@dragon.nuxi.com>
References: <200401211627.i0LGRvUS089121@repoman.freebsd.org>
	<20040126042448.GA11430@dragon.nuxi.com>
	<20040126130024.GD9772@madman.celabo.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040126130024.GD9772@madman.celabo.org>
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 5.2-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/contrib/cvs/src modules.c server.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: obrien@FreeBSD.org
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: Wed, 28 Jan 2004 17:44:20 -0000

On Mon, Jan 26, 2004 at 07:00:24AM -0600, Jacques A. Vidrine wrote:
> On Sun, Jan 25, 2004 at 08:24:48PM -0800, David O'Brien wrote:
> > On Wed, Jan 21, 2004 at 08:27:57AM -0800, Jacques Vidrine wrote:
> > > nectar      2004/01/21 08:27:57 PST
> > >
> > >   FreeBSD src repository
> > >
> > >   Modified files:        (Branch: CYCLIC)
> > >     contrib/cvs/src      modules.c server.c
> > >   Log:
> > >   Incorporate two security fixes from later versions of CVS.
> > >   From the NEWS file of cvs 1.11.11:
> >
> > This is a messy way to do this -- why didn't we just do a full import of
> > 1.11.11?
> 
> Well *I* didn't do a full import because I'm not our CVS maintainer
> and I don't want to be the CVS maintainer.  I like the job our current
> CVS maintainer does and I'm content to wait until he is ready to
> import a new version.
> 
> So instead I followed standard procedure for incorporating a bugfix
> from upstream without importing a new version.  I'm not sure what's so
> messy.

It makes the vendor branch isn't consistent -- a hodge-podge of sources.
The standard procedure for incorporating a bugfix assumes that once there
is a full release out with the bug fix it would be imported.