From owner-cvs-src@FreeBSD.ORG Thu May 19 07:59:49 2005 Return-Path: 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 6ED9416A4CE; Thu, 19 May 2005 07:59:49 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51C8043D1D; Thu, 19 May 2005 07:59:48 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j4J7xlEL052625; Thu, 19 May 2005 10:59:47 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 18460-13; Thu, 19 May 2005 10:59:46 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j4J7xk9d052622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 19 May 2005 10:59:46 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j4J805sV058012; Thu, 19 May 2005 11:00:05 +0300 (EEST) (envelope-from ru) Date: Thu, 19 May 2005 11:00:05 +0300 From: Ruslan Ermilov To: Maxim Sobolev Message-ID: <20050519080005.GC57313@ip.net.ua> References: <200505170144.j4H1icUK066441@repoman.freebsd.org> <428965A5.2010406@FreeBSD.org> <20050519045906.GA56261@dragon.NUXI.org> <428C2F27.3030607@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oTHb8nViIGeoXxdp" Content-Disposition: inline In-Reply-To: <428C2F27.3030607@FreeBSD.org> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: obrien@FreeBSD.org Subject: Re: cvs commit: src/lib/libstand Makefile bzlib.c.diff bzlib.h.diff bzlib_private.h.diff X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2005 07:59:49 -0000 --oTHb8nViIGeoXxdp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 19, 2005 at 09:16:07AM +0300, Maxim Sobolev wrote: > David O'Brien wrote: > >Patches do not belong in /usr/src - what's the point of an SCM then? > >We either use a programmatic way of changing the source useing > >sh/sed/awk, or We either take the file off the vendor branch. >=20 > Pardon me, but can you please clarify who those "We" are? It is not=20 > immediately clear to me. >=20 > I don't see any more or less significant differencies between using=20 > sh(1)/sed(1)/awk(1) and patch(1). All of those (and many other) tools=20 > are in the base tree and can be used more or less freely in the=20 > buildworld process. >=20 I'd agree with David here *if* we had a way to return the file back on the vendor branch. Unfortunately, it's impossible with the current version of CVS. Until then, when the changes are believed to be temporary (e.g., there's a hope they will be accepted by upstream or a better solution is in works that can similarly be accepted when done), using patch(1) looks reasonable. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --oTHb8nViIGeoXxdp Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFCjEeFqRfpzJluFF4RAryfAKCcUOa022Es68qDXlowO+dCkZ5KSgCcDbQF hfehUT3XIrxDYNu+o6oIF5w= =gM1n -----END PGP SIGNATURE----- --oTHb8nViIGeoXxdp--