Date: Sun, 23 Feb 2020 10:30:21 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Mathieu Arnold <mat@FreeBSD.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, Cy Schubert <cy@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r526863 - head/shells/ksh93-devel Message-ID: <202002231830.01NIUL3q003289@slippy.cwsent.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <ghudson@mit.edu> Date: Wed Feb 19 15:36:38 2020 -0500 commit dea66c146cd3587b01c511ac4813fb54e41b0303 Author: Greg Hudson <ghudson@mit.edu> Date: Mon Feb 17 19:09:17 2020 -0500 commit 1ad47d436e2e748fb20d4b08f85ed8dda2b3fd3c Author: Michael Mattioli <mmattioli@users.noreply.github.com> Date: Mon Nov 25 21:28:57 2019 -0500 commit 21d823991a81d64af460ec62a98585c85534850b Author: Isaac Boukris <iboukris@gmail.com> Date: Thu Jan 30 19:38:44 2020 +0100 commit bf9b2134ceddd6c727362be894b1c95c297a0f17 Author: Robbie Harwood <rharwood@redhat.com> Date: Wed Feb 5 12:56:00 2020 -0500 commit b2190fdc253de6024001e0f1ff9fe56c31042bb7 Author: Greg Hudson <ghudson@mit.edu> 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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002231830.01NIUL3q003289>