Date: Sun, 23 Feb 2020 16:45:59 +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: <20200223154559.v4hlnjn24f7fxr2g@atuin.in.mat.cc> In-Reply-To: <202002231502.01NF2lj5007283@slippy.cwsent.com> References: <202002222317.01MNHbLo027195@repo.freebsd.org> <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc> <202002231502.01NF2lj5007283@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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@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? --=20 Mathieu Arnold --iv7vfm2x4yy32u2z Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl5SnjZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkh9iw/7BCh6aWeIOgJqKo9plh2jFx+oa+PwZXjgdaBmmMajjg/cZKvA341I3LlI 021jKvd9VGjrbrHdut9AXggzykUQ61TIVH92bWBCJ03wMlc9HudB4lG6L2KC18eQ 6Tjr82IhJE/R2aRCPWSjE+H6snhbFXZv015y9fuw5hhQnUI+IThutgKpSDE+MSFT 1evO7ZEDulPciBHq1ju7fSIlyI+21KmDxKCIN7v9ZdSuWCAxTQH8l7EtjTMDpkX8 Kd22+G0GfU6Lg6vE6aCSAzSXl+1lq4VxleDyOUlUHV+ph5CY0LcStcaWLG1HXSw8 J5JHHIr6827kroutzLQy8G9ULX7vTkeVaKBvvkcSUU6JcEBeI3GOSTjh5kFeRSTT UpH5BBYatqC7+CgNhx64Beb0f3L9mBS0/MJA4iy7qrLXztW13cc1U1kHw+oDTj5l S04cyzWQRWKZbFlCYhVuMxu4XESl/uWcZcR8+WBNVUWK1I/qd/FxkJn1Hx6iLJld Nr8E+qRwyJ70HLVQQlHiYldXtx1rHhQPD2fRlEpVBr234IgOm+42dMQNhznZc5TO Umk7liXseqslqoNsoAeLwZvBj1B0deBeJZZzQ2Fvuk/qrptV2TnwSHtu3GnVxMAe SghX6qwSDyWAqCVmc5pjCg7JuTGC5S19ClYBBZOF2QP++mrFdAo= =C4Px -----END PGP SIGNATURE----- --iv7vfm2x4yy32u2z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200223154559.v4hlnjn24f7fxr2g>