From owner-cvs-all Sun Oct 29 12:54:22 2000 Delivered-To: cvs-all@freebsd.org Received: from citusc17.usc.edu (citusc17.usc.edu [128.125.38.177]) by hub.freebsd.org (Postfix) with ESMTP id EE8E037B479; Sun, 29 Oct 2000 12:54:16 -0800 (PST) Received: (from kris@localhost) by citusc17.usc.edu (8.11.1/8.11.1) id e9TKuRN98963; Sun, 29 Oct 2000 12:56:27 -0800 (PST) (envelope-from kris) Date: Sun, 29 Oct 2000 12:56:27 -0800 From: Kris Kennaway To: "David O'Brien" Cc: Doug Barton , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssl/apps openssl.cnf Message-ID: <20001029125627.B98136@citusc17.usc.edu> References: <200010291000.CAA45118@freefall.freebsd.org> <20001029025521.A87604@dragon.nuxi.com> <39FC0867.16607D7F@yahoo-inc.com> <20001029092743.C89229@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="MfFXiAuoTsnnDAfZ" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20001029092743.C89229@dragon.nuxi.com>; from obrien@FreeBSD.org on Sun, Oct 29, 2000 at 09:27:43AM -0800 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --MfFXiAuoTsnnDAfZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 29, 2000 at 09:27:43AM -0800, David O'Brien wrote: > On Sun, Oct 29, 2000 at 03:22:15AM -0800, Doug Barton wrote: > > In truth, because cvs id's make mergemaster comparisons much faster. >=20 > After thinking a bit longer I finally came up with this maybe the case. Yep - it's annoying to have to manually deal with files without an $Id$ line if you make local changes to them. > > The file is comparatively small, and this is a one line change, so the > > repo bloat will be small.=20 >=20 > For things I maintain, it isn't just the repo bloat, but the fact CVS > handles this simple change stupidly. :-( So it takes that much longer to > check and fix conflicts, especially when you have many files with even > only $FreeBSD$ added. Since this is a config file which we don't touch I can just spam the new vendor versions over the top of it and add in $FreeBSD$ - much easier than trying to merge in code changes. > Its only a problem if Kris says it is. I just point out when files leave > the vendor branch to make sure people realized it happened. Thanks. Kris --MfFXiAuoTsnnDAfZ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: PGPfreeware 5.0i for non-commercial use MessageID: CFeSHCm3Pr5RJGTB3PGeR+voUn5YnpJz iQA/AwUBOfyO+lq8tAVo6EClEQK6VgCgmuYLBxm+1n33nBUxXmcI/gf12IwAoJY1 OdpVGkWVJNQGHGMVAPiPxbMp =wIoZ -----END PGP SIGNATURE----- --MfFXiAuoTsnnDAfZ-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message