Date: Sun, 23 Feb 2020 07:02:47 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Mathieu Arnold <mat@FreeBSD.org> Cc: 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: <202002231502.01NF2lj5007283@slippy.cwsent.com> In-Reply-To: <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc> References: <202002222317.01MNHbLo027195@repo.freebsd.org> <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20200223083358.kl6wgdcj2pekzess@atuin.in.mat.cc>, Mathieu 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 > >=20 > > Log: > > Resolve distfile mismatch from r526860. > > =20 > > The update sat in my git tree for a couple of weeks before merging the > > branch. I updated the commit date without regenerating distfile. > > =20 > > Pointy hat to: cy > >=20 > > Modified: > > head/shells/ksh93-devel/distinfo (contents, props changed) > >=20 > > Modified: head/shells/ksh93-devel/distinfo > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D > > --- 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 =3D 1581223383 > > -SHA256 (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D a78f2930e9daeb= > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > -SIZE (ksh93/att-ast-2020.02.08-0be82553_GH0.tar.gz) =3D 12960534 > > +TIMESTAMP =3D 1582412909 > > +SHA256 (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D a78f2930e9daeb= > d3950044eb899dfbcae67ac8e2599346aa25c2fd6fb8097bf0 > > +SIZE (ksh93/att-ast-2020.02.22-0be82553_GH0.tar.gz) =3D 12960534 > > How can the commit date change and the hash remain the same? This is a > very very unlikely collision. That was purely my fault. I had built and tested the port and committed it to a branch of my git tree. Prior to merging it to master I changed the commit date a more recent date to reflect the git svn dcommit I was planning that day. Then did git rebase to redo the commit, git merge to merge back to master, and finally git svn dcommit. I missed a step in my workfolow. -- 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?202002231502.01NF2lj5007283>