Date: Sun, 29 May 2016 19:38:34 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@freebsd.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: Cy Schubert <Cy.Schubert@komquats.com>, <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-vendor@freebsd.org> Subject: Re: svn commit: r300961 - vendor/one-true-awk/dist Message-ID: <420106426.1255688.1464550714956.JavaMail.yahoo@mail.yahoo.com> In-Reply-To: <201605291922.u4TJMHUZ069145@slippy.cwsent.com> References: <pfg@FreeBSD.org> <201605291922.u4TJMHUZ069145@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <Cy.Schubert@komquats.com= > 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 <Cy.Schubert@komquats.com> or <Cy.Schubert@cschubert.com> FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?420106426.1255688.1464550714956.JavaMail.yahoo>