From owner-svn-ports-head@freebsd.org Mon Feb 24 12:25:43 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 F3FB725B46D; Mon, 24 Feb 2020 12:25:42 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48R1Vt5zzgz4Z68; Mon, 24 Feb 2020 12:25:42 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id D4D2C22186; Mon, 24 Feb 2020 12:25:41 +0000 (UTC) From: Jan Beich To: Cy Schubert Cc: Mathieu Arnold , svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org, Cy Schubert Subject: Re: svn commit: r526863 - head/shells/ksh93-devel 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> <202002231830.01NIUL3q003289@slippy.cwsent.com> Date: Mon, 24 Feb 2020 13:25:39 +0100 In-Reply-To: <202002231830.01NIUL3q003289@slippy.cwsent.com> (Cy Schubert's message of "Sun, 23 Feb 2020 10:30:21 -0800") Message-ID: <8sks-cgu4-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain 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: Mon, 24 Feb 2020 12:25:43 -0000 Cy Schubert writes: > 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. GitHub does report CommitDate in addition to AuthorDate e.g., https://github.com/krb5/krb5/commits/master where "Commits on Feb 17, 2020" refers to CommitDate but if you open the specific commit its AuthorDate is from "Nov 26, 2019".