From owner-svn-src-vendor@freebsd.org Sun May 29 20:33:54 2016 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1563AB54647 for ; Sun, 29 May 2016 20:33:54 +0000 (UTC) (envelope-from pfg@freebsd.org) Received: from nm20.bullet.mail.bf1.yahoo.com (nm20.bullet.mail.bf1.yahoo.com [98.139.212.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB2001011 for ; Sun, 29 May 2016 20:33:53 +0000 (UTC) (envelope-from pfg@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1464550716; bh=VAxcfVCB2nVapUfSWQzOnpXGOzotBYltP39MvmfXED0=; h=Date:From:To:Cc:In-Reply-To:References:Subject:From:Subject; b=sDkE63Me39BqaSalhYC5QeLLu+yWWO8SfdL50oSBNmUkYc6RsbzJdFUerOQTSx51czMPQELHWazm1vXsLtl5VgOUoTjPxLUyZ0ZSbbp+isVTGs+ccwGxFU2MxEShSU44Q7VGKYEturmpUuegXZQA80HeXBQy63Nxuf64ZbEacn+sy+HIUBV929p0aQLVyQBcR2eCYmkUFOyLFnIiqmTJ13yS27G7XURRfYzQ/+YZjOQVwCE71XVPN/Za3D03u4wlEAltMaz+Rq/yDjvlRcpNus287dipJpF8xV4K9PiCbvB4GwPyhTe4QyQqe6vhwiepuPVElL/KbcbXh214eahF3Q== Received: from [66.196.81.171] by nm20.bullet.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:38:36 -0000 Received: from [98.139.212.200] by tm17.bullet.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:38:36 -0000 Received: from [127.0.0.1] by omp1009.mail.bf1.yahoo.com with NNFMP; 29 May 2016 19:38:36 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 140249.12814.bm@omp1009.mail.bf1.yahoo.com X-YMail-OSG: DICSCDQVM1nrw66YQvXRzzV5yr.jK.2MreJsOhBVSjSJOgnEd665_UepyGRpl0H 25hxfCy0rv.L_9pvUUm.q.wdCTrAs6PMXSDU727n_J6LimU.dw8umkM4_zsSfY7q6U_hLBp.hfng SNhVWLNSKVT2ogtoj.8utsueD7WsV63iqBQJpwidR1HYxSF9EElFMUAHrOLghxNaKTyV42RosiiF 1DtlQ77Vsk._iRCe61xgzRHOWq8IstIp_ArUHc6gy1TkoNBe2WqIczDfLdvbkOZOL.MkfQTOlCiM 1sHW.ksRVeNyCEhLNvYzm5Z5yrkHOP5UEifUlDJo9rH7hxY4vPVVuCGFtKYJ7.FG1p06tVQD_DPj DXyIIGJxYgfG6QxFTUzmqlc9_dyk7vg0nlfSiMEFGZ6iWHsYt3sXFdTlIl.QHlp3joGrx.aoQLtx m8BIEM.vYNPVt1SjSQFYPfDlsomd12c2FHvC02ML29o_vvOSNZdSuykpRoDuJvKmx34D42dE9g.S NshgSX5EP Received: from jws106179.mail.bf1.yahoo.com by sendmailws153.mail.bf1.yahoo.com; Sun, 29 May 2016 19:38:35 +0000; 1464550715.693 Date: Sun, 29 May 2016 19:38:34 +0000 (UTC) From: "Pedro F. Giffuni" To: Cy Schubert Cc: Cy Schubert , , , Message-ID: <420106426.1255688.1464550714956.JavaMail.yahoo@mail.yahoo.com> In-Reply-To: <201605291922.u4TJMHUZ069145@slippy.cwsent.com> References: <201605291922.u4TJMHUZ069145@slippy.cwsent.com> Subject: Re: svn commit: r300961 - vendor/one-true-awk/dist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2016 20:33:54 -0000 blockquote, div.yahoo_quoted { margin-left: 0 !important; border-left:1px = #715FFA solid !important; padding-left:1ex !important; background-color:whi= te !important; } The patches are not local as they are not in base (yet).I= will merge them to current when I find time. Pedro. Enviado desde Yahoo Mail para iPad El domingo, mayo 29, 2016, 2:22 p.m., Cy Schubert escribi=C3=B3: In message <574B3E4B.2020501@FreeBSD.org>, Pedro Giffuni writes: > On 29/05/2016 13:17, Cy Schubert wrote: > > In message <574B2EAC.3010908@FreeBSD.org>, Pedro Giffuni writes: > >> > >> > >> On 29/05/2016 12:37, Cy Schubert wrote: > >>> In message <201605291618.u4TGItNJ024583@repo.freebsd.org>, "Pedro F. > >>> Giffuni" w > >>> rites: > >>>> Author: pfg > >>>> Date: Sun May 29 16:18:55 2016 > >>>> New Revision: 300961 > >>>> URL: https://svnweb.freebsd.org/changeset/base/300961 > >>>> > >>>> Log: > >>>>=C2=A0 =C2=A0 one-true-awk: replace 0 with NULL for pointers > >>>>=C2=A0 =C2=A0=20 > >>>>=C2=A0 =C2=A0 Also remove a redundant semicolon. > >>>>=C2=A0 =C2=A0 Submitted upstream already. > >>>> > >>>> Modified: > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/b.c > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/lex.c > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/maketab.c > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/parse.c > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/run.c > >>>>=C2=A0 =C2=A0 vendor/one-true-awk/dist/tran.c > >>>> > >>> Was this commit and r300962 obtained from the upline or vendor or wer= e > >>> these commits local to FreeBSD only? > >>> > >>> > >> There is no public awk public repository AFAICT, but bwk acknowledged > >> the submission. > >> > >> The change to openresolv was merged to the public repository. > > As they've acknowledged the submissions, can you please tag the new > > versions of awk and openresolve with the correct upstream version numbe= rs, > > please? > > > That's an impossible request as there are no "correct upstream version=20 > numbers". >=20 > In the case of openresolv, I included the repository revision, but=20 > checksums have > no chronological sense and should be avoided for tags. >=20 > In this case using tags for anything other than official releases would= =20 > be a mess. > As stated in our subversion primer (5.4.4): >=20 > "Vendor patches should be committed to the vendor branch, and merged=20 > from there to head. If the patch addresses an issue in a new release=20 > that is currently being imported, it /must not/ be committed along with= =20 > the new release: the release must be imported and tagged first, then the= =20 > patch can be applied and committed. There is no need to re-tag the=20 > vendor sources after committing the patch." >=20 That doesn't address local patches. These were local patches that were=20 upstreamed. I rea this as, if one got a patch from an upstream VCS repo but= =20 these were our local patches. At the very least the commit logs should=20 reference the upstream commit log entry (which the openresolve one did but= =20 the awk commit did not). I think that a clear audit trail back to the=20 vendor VCS, bug#, etc., be documented in the commit log. --=20 Cheers, Cy Schubert or FreeBSD UNIX:=C2=A0 =C2=A0 Web:=C2=A0 http://www.FreeBSD.or= g =C2=A0=C2=A0=C2=A0 The need of the many outweighs the greed of the few. =20