From owner-svn-ports-all@freebsd.org Sun Feb 23 18:30:27 2020 Return-Path: Delivered-To: svn-ports-all@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 089282443F8; Sun, 23 Feb 2020 18:30:27 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (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 48QYf932Mwz4X20; Sun, 23 Feb 2020 18:30:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 5w1GjfPEu17ZD5w1HjHG4j; Sun, 23 Feb 2020 11:30:24 -0700 X-Authority-Analysis: v=2.3 cv=ZsqT1OzG c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=l697ptgUJYAA:10 a=NEAV23lmAAAA:8 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=X-0a_y5edeA3R2BSGvQA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id A1A05A8B; Sun, 23 Feb 2020 10:30:21 -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 01NIULNg003292; Sun, 23 Feb 2020 10:30:21 -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 01NIUL3q003289; Sun, 23 Feb 2020 10:30:21 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202002231830.01NIUL3q003289@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: <20200223180058.73ml7qthhj5phvn6@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> <202002231702.01NH2YOD008243@slippy.cwsent.com> <20200223180058.73ml7qthhj5phvn6@atuin.in.mat.cc> Comments: In-reply-to Mathieu Arnold message dated "Sun, 23 Feb 2020 19:00:58 +0100." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 23 Feb 2020 10:30:21 -0800 X-CMAE-Envelope: MS4wfLpJl+KHgC6wwuflKeQZ7+lc8v7XmfpDchOQ1/xVavEHnUynKfvyEOnxYHpIWyQNU7Jm2iAwuzjprmdLqfDoTstVGaMLxc3eW4hcCVLlMo+1tC4StGkM SxIv0UQEXhnfYmEj9dFsWJjk1+xyp6lj0OjFIpdVI/iAqDZ9HxbwWhsuXA0v2d3BksleZWGmY3u5s/HoNRPqzc3TdNfPy5+xY0c4dF84IBTjXerul+frBcfT 3Bj3fnQETAwlNmrhdnWZ7Nus4/g8Fj1EaULRLTk8GyxI9TPISbJwMj0jZ3SG7w/ZIk/8xkMDfZv30+N64Lw5vw== X-Rspamd-Queue-Id: 48QYf932Mwz4X20 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.136.137) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-4.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; 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)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCPT_COUNT_FIVE(0.00)[6]; REPLYTO_EQ_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11]; TO_MATCH_ENVRCPT_SOME(0.00)[]; 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.40)[ip: (-6.19), ipnet: 64.59.128.0/20(-3.22), asn: 6327(-2.51), country: CA(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[137.136.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2020 18:30:27 -0000 In message <20200223180058.73ml7qthhj5phvn6@atuin.in.mat.cc>, Mathieu Arnold wr ites: > On Sun, Feb 23, 2020 at 09:02:34AM -0800, Cy Schubert wrote: > > In message <20200223154559.v4hlnjn24f7fxr2g@atuin.in.mat.cc>, Mathieu=20 > > Arnold wr > > ites: > > > > > > > > > > How can the commit date change and the hash remain the same? This = > is a > > > > > very very unlikely collision. > > > >=3D20 > > > > That was purely my fault. I had built and tested the port and committ= > ed i=3D > > > t=3D20 > > > > to a branch of my git tree. Prior to merging it to master I changed t= > he=3D > > > =3D20 > > > > commit date a more recent date to reflect the git svn dcommit I was= > =3D20 > > > > planning that day. Then did git rebase to redo the commit, git merge = > to=3D > > > =3D20 > > > > merge back to master, and finally git svn dcommit. I missed a step in= > my=3D > > > =3D20 > > > > workfolow. > > > > > > I still do not understand, how does that influence the date the commit > > > referenced by the hash, 0be82553 here, was made? > >=20 > > OK, here's the timeline. > >=20 > > Feb 8: > >=20 > > 1. I branch master to ksh93 in my github repo. > > 2. The port is updated. COMMIT_DATE=3D2020-02-08 > > 3. make makesum > > 4. Port is built, builds correctly. > > 5. Port is committed to my ksh93 branch. (The other ksh93 is also=20 > > committed.) > >=20 > > Feb 22: > >=20 > > 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=20 > > 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. > >=20 > > That's how it happened. Do you understand now? > > Mmmm, ok, but, the version of the port is supposed to be about upstream, > not some made up date you create. In this case, the version is supposed > to be the date of the *upstream* commit, not the date where you do > stuff. That makes sense. I started doing this when I realized github didn't report commits accurately so I opted to use the date I did the work. If a person maintains a local copy of a git repo and issues git pull and rebase, commits are out of order as we can see from the krb5 repo. Pull requests are out of date. commit 109e30ce22c20f18b8233119f274935bdf573886 (HEAD -> master, origin/master, origin/HEAD) Author: Greg Hudson Date: Wed Feb 19 15:36:38 2020 -0500 commit dea66c146cd3587b01c511ac4813fb54e41b0303 Author: Greg Hudson Date: Mon Feb 17 19:09:17 2020 -0500 commit 1ad47d436e2e748fb20d4b08f85ed8dda2b3fd3c Author: Michael Mattioli Date: Mon Nov 25 21:28:57 2019 -0500 commit 21d823991a81d64af460ec62a98585c85534850b Author: Isaac Boukris Date: Thu Jan 30 19:38:44 2020 +0100 commit bf9b2134ceddd6c727362be894b1c95c297a0f17 Author: Robbie Harwood Date: Wed Feb 5 12:56:00 2020 -0500 commit b2190fdc253de6024001e0f1ff9fe56c31042bb7 Author: Greg Hudson Date: Wed Feb 5 18:46:11 2020 -0500 In this case we are ok but should a person check an upstream three commits ago, the latest commit is Nov 25, 2019 because that's when they merged a pull request. This raises a number of issues: 1. For us in ports it's easy to git log to find the latest commit date. 2. Considering svn / git discussion, would out of order commit dates be a concern? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.