Date: Wed, 28 Jan 2004 09:44:13 -0800 From: "David O'Brien" <obrien@FreeBSD.org> To: "Jacques A. Vidrine" <nectar@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/cvs/src modules.c server.c Message-ID: <20040128174413.GA74224@dragon.nuxi.com> In-Reply-To: <20040126130024.GD9772@madman.celabo.org> References: <200401211627.i0LGRvUS089121@repoman.freebsd.org> <20040126042448.GA11430@dragon.nuxi.com> <20040126130024.GD9772@madman.celabo.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040128174413.GA74224>