Date: Sun, 23 Feb 2020 19:00:58 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Mathieu Arnold <mat@FreeBSD.org>, 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: <20200223180058.73ml7qthhj5phvn6@atuin.in.mat.cc> In-Reply-To: <202002231702.01NH2YOD008243@slippy.cwsent.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
--6jl6oykrra5sn5ta Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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: > >=20 > > > > --iv7vfm2x4yy32u2z > > Content-Type: text/plain; charset=3Dus-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= =3D20 > > > 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 > > > > >=3D3D20 > > > > > Log: > > > > > Resolve distfile mismatch from r526860. > > > > > =3D3D20 > > > > > The update sat in my git tree for a couple of weeks before merg= ing =3D > > the > > > > > branch. I updated the commit date without regenerating distfile. > > > > > =3D3D20 > > > > > Pointy hat to: cy > > > > >=3D3D20 > > > > > Modified: > > > > > head/shells/ksh93-devel/distinfo (contents, props changed) > > > > >=3D3D20 > > > > > Modified: head/shells/ksh93-devel/distinfo > > > > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D= =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3=3D > > D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D= =3D3D > > > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3= D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D= =3D3D3D=3D3D > > > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3= D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D=3D3D3D= =3D3D3D=3D3D > > > > =3D3D3D=3D3D3D=3D3D3D=3D3D3D > > > > > --- 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 =3D3D3D 1581223383 > > > > > -SHA256 (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D3D3D a7= 8f2930=3D > > e9daeb=3D3D > > > > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > > > > -SIZE (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D3D3D 1296= 0534 > > > > > +TIMESTAMP =3D3D3D 1582412909 > > > > > +SHA256 (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D3D3D a7= 8f2930=3D > > e9daeb=3D3D > > > > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > > > > +SIZE (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D3D3D 1296= 0534 > > > > > > > > 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. --=20 Mathieu Arnold --6jl6oykrra5sn5ta Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl5SvdpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zki/kw//VNBsFzK3vpKHf+ppg8I//6iNqGDqBxsxHpuEUc7gobanGY33/Je2IpNy YUL/HQ+fagbF607Re38cSUs4lNwzmkkygs1M2/e9aOzldfxnVDMWEr1drjXJiNnS gwK/iAdrDD0NypOMtRo16UFD8wurnVJ0KLgTQNfDV+D3tU15X/K0KbBxRo/ub1qg xcIzWYcB4iTqAbhosWdfdXDSlul3InaLABD1c2jk4quI5VxcjVY8GoEO2Bvlm/tk OZL0zIEHDnK6NEbKK9OqcoWtlH3HEZxqgKuBoE2ft0ahOtes40FWB43BnKSPQGHp 0MYFh/TQzshYSDCn30qYF3sDL9oRk+sOgA9r6Gx57mU929tXWgpmWNtWGnBtDQIn PQ+EE6ni8bLTqN2HGsh/84OLX5KEl3NVr1FiGmBq1Lc6Iy96pVhxX6GBoZ/rTMm5 yNm/Q5Xfloqx1tyD/XBIVIvYCGFzHZhre6aR7ZTkLPJcFBwTvCFoUwtKPxIUT/gF 68Mt+vDr2C8MK6OT7EOH7kiMMycEdbbJNd0qj0gWqti6ncAEmSiiixlqnpN/RWkH okYGyPeJkOPvhGZ0I/tw3pmXNqstTktghmJqd4UzU7j0KDseiEkzWyynT/EKF5b4 yK2rrRT4JFQzbT77JeCeaH6fWnCxO2TiVx3KuHJ7q8k90upKkTI= =YN7V -----END PGP SIGNATURE----- --6jl6oykrra5sn5ta--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200223180058.73ml7qthhj5phvn6>