From owner-svn-ports-head@freebsd.org Sun Feb 23 17:02:40 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9A592242598; Sun, 23 Feb 2020 17:02:40 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 48QWhv0kdDz3BmF; Sun, 23 Feb 2020 17:02:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 5ueIjgz2CkqGX5ueKjd59b; Sun, 23 Feb 2020 10:02:37 -0700 X-Authority-Analysis: v=2.3 cv=c/jVvi1l c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=l697ptgUJYAA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=UhPVuQpoMlnMdM4AiL0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 4CEF494F; Sun, 23 Feb 2020 09:02:34 -0800 (PST) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 01NH2Y2J008246; Sun, 23 Feb 2020 09:02:34 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 01NH2YOD008243; Sun, 23 Feb 2020 09:02:34 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202002231702.01NH2YOD008243@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mathieu Arnold cc: Cy Schubert , Cy Schubert , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r526863 - head/shells/ksh93-devel In-reply-to: <20200223154559.v4hlnjn24f7fxr2g@atuin.in.mat.cc> References: <202002222317.01MNHbLo027195@repo.freebsd.org> <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc> <202002231502.01NF2lj5007283@slippy.cwsent.com> <20200223154559.v4hlnjn24f7fxr2g@atuin.in.mat.cc> Comments: In-reply-to Mathieu Arnold message dated "Sun, 23 Feb 2020 16:45:59 +0100." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 23 Feb 2020 09:02:34 -0800 X-CMAE-Envelope: MS4wfFDUtkyfXLqbLBukHBNFFyKe515yEUrX0RYFiO/CYNmeeWAAatq9Tn+QaYM4MXcseuQlUDbGtWUdpt/di5dNqQpm94D5grFnNcRDiyrS24NEfVNzGwhT ShxcbXFnRdPeTD4V4W9pF2dSrlx95AeAygEg4fmpEEJSkApzGazFPWdHk4zmQ4dYR3m5QmEFYlsA5fytgiBewD6n7OF3GcVIcnFMdQv2wmiuJ4T87t8jovEr k4pzuzvig9Rw8SC7OcRkcOaRB1e5MDlejtTa+lBuaQP64oe8r+piGK6kEFfk5hXtpP0v24Qlh3MH2kHC6Shfgg== X-Rspamd-Queue-Id: 48QWhv0kdDz3BmF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.13) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-4.18 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCPT_COUNT_FIVE(0.00)[6]; REPLYTO_EQ_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-2.48)[ip: (-6.56), ipnet: 64.59.128.0/20(-3.23), asn: 6327(-2.51), country: CA(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[13.134.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2020 17:02:40 -0000 In message <20200223154559.v4hlnjn24f7fxr2g@atuin.in.mat.cc>, Mathieu Arnold wr ites: > > > --iv7vfm2x4yy32u2z > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Sun, Feb 23, 2020 at 07:02:47AM -0800, Cy Schubert wrote: > > In message <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc>, Mathieu=20 > > Arnold wr > > ites: > > > On Sat, Feb 22, 2020 at 11:17:37PM +0000, Cy Schubert wrote: > > > > Author: cy > > > > Date: Sat Feb 22 23:17:36 2020 > > > > New Revision: 526863 > > > > URL: https://svnweb.freebsd.org/changeset/ports/526863 > > > >=3D20 > > > > Log: > > > > Resolve distfile mismatch from r526860. > > > > =3D20 > > > > The update sat in my git tree for a couple of weeks before merging = > the > > > > branch. I updated the commit date without regenerating distfile. > > > > =3D20 > > > > Pointy hat to: cy > > > >=3D20 > > > > Modified: > > > > head/shells/ksh93-devel/distinfo (contents, props changed) > > > >=3D20 > > > > Modified: head/shells/ksh93-devel/distinfo > > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3= > D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= > =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D > > > =3D3D=3D3D=3D3D=3D3D > > > > --- head/shells/ksh93-devel/distinfo Sat Feb 22 23:05:45 2020 > > > (r526862) > > > > +++ head/shells/ksh93-devel/distinfo Sat Feb 22 23:17:36 2020 > > > (r526863) > > > > @@ -1,3 +1,3 @@ > > > > -TIMESTAMP =3D3D 1581223383 > > > > -SHA256 (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D3D a78f2930= > e9daeb=3D > > > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > > > -SIZE (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D3D 12960534 > > > > +TIMESTAMP =3D3D 1582412909 > > > > +SHA256 (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D3D a78f2930= > e9daeb=3D > > > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > > > +SIZE (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D3D 12960534 > > > > > > How can the commit date change and the hash remain the same? This is a > > > very very unlikely collision. > >=20 > > That was purely my fault. I had built and tested the port and committed i= > t=20 > > to a branch of my git tree. Prior to merging it to master I changed the= > =20 > > commit date a more recent date to reflect the git svn dcommit I was=20 > > planning that day. Then did git rebase to redo the commit, git merge to= > =20 > > merge back to master, and finally git svn dcommit. I missed a step in my= > =20 > > workfolow. > > I still do not understand, how does that influence the date the commit > referenced by the hash, 0be82553 here, was made? OK, here's the timeline. Feb 8: 1. I branch master to ksh93 in my github repo. 2. The port is updated. COMMIT_DATE=2020-02-08 3. make makesum 4. Port is built, builds correctly. 5. Port is committed to my ksh93 branch. (The other ksh93 is also committed.) Feb 22: 6. git merge from ksh93 to master 7. I realize the COMMIT_DATE of 2020-02-08 is now incorrect. 8. I change the commit date to the current date and use git rebase to re-commit the commit. 9. (I forgot to make maksum when I changed the commit date. My bad.) 10. git svn dcommit to push my commits to svn. That's how it happened. Do you understand now? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.