svn commit: r526863 - head/shells/ksh93-devel

[Mathieu Arnold]

On Sun, Feb 23, 2020 at 09:02:34AM -0800, Cy Schubert wrote:
> In message <20200223154559.v4hlnjn24f7fxr2g at 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 at 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?

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.

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20200223/c3a304fe/attachment.sig>