Re: Hash changes in the freebsd-ports GitHub mirror
Sorry for seeing this message so late, here's what happened:
1. There was metadata corruption in the SVN repo that is used as the source
for the svn2git conversion, this repo is kept up-to-date using svnsync, and
it turns out svnsync does not operate atomically.
2. Someone "fixed" the corrupt SVN repos, but that means we can no longer
reproduce what is published on github <- this happened last year and we've
had this Damocles sword dangling above the repos for that long
3. bitbucket changed their permissions model and somehow this caused git to
chew up 100% cpu when doing anything inside the "src" repo (wtf?)
4. I stopped everything, fixed bitbucket ssh keys, started deleting
bitbucket branches as we're approaching the 2G limit
5. seeing that a proper repack was in order, I did a git repack on
base/ports/doc
6. ???
7. svn2git started to re-convert freebsd-ports from rev 1 (wtf wtf?)
Because (7) used the fixed repo, this should now actually be the proper 1:1
conversion from SVN ... unless there's more metadata corruption that we did
not fix. I am currently checking this with another run on a different
machine, but that machine is slower and not even half done yet.
The interesting thing to note is that:
a) obviously no one is doing the conversion in-house and found out that
they get different hashes, although this is documented on
https://wiki.freebsd.org/GitWorkflow
b) we still have the same problem for src and doc. We can *not* reproduce
the version that is published on github (different timestamps/authors on
the commit metadata)
Expect more turbulences
Uli
2016-12-02 10:40 GMT+01:00 Raphael Kubo da Costa :
> Hi all,
>
> I tried running `git pull` a few minutes ago and had a ton of conflicts.
>
> It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
> ("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
> now different in all GitHub branches.
>
> Is anyone else experiencing this? Was this change intentional?
>
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: Hash changes in the freebsd-ports GitHub mirror
On Fri, Dec 02, 2016 at 04:08:23PM +, Steven Hartland wrote:
> On 02/12/2016 15:12, Shawn Webb wrote:
> > On Fri, Dec 02, 2016 at 10:40:29AM +0100, Raphael Kubo da Costa wrote:
> >> Hi all,
> >>
> >> I tried running `git pull` a few minutes ago and had a ton of conflicts.
> >>
> >> It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
> >> ("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
> >> now different in all GitHub branches.
> >>
> >> Is anyone else experiencing this? Was this change intentional?
> > We at HardenedBSD are affected as well. Well, time to spend my weekend
> > resolving merge conflicts.
> >
> > Seems like any downstream project that relies on the GitHub mirror of
> > the ports tree will have issues. Major ouch.
> >
> Did someone do a force push?
Looks like the svn2git conversion script iis having issues:
https://lists.freebsd.org/pipermail/freebsd-git/2016-December/74.html
--
Shawn Webb
Cofounder and Security Engineer
HardenedBSD
GPG Key ID: 0x6A84658F52456EEE
GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE
signature.asc
Description: PGP signature
Re: Hash changes in the freebsd-ports GitHub mirror
On 02/12/2016 15:12, Shawn Webb wrote:
On Fri, Dec 02, 2016 at 10:40:29AM +0100, Raphael Kubo da Costa wrote:
Hi all,
I tried running `git pull` a few minutes ago and had a ton of conflicts.
It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
now different in all GitHub branches.
Is anyone else experiencing this? Was this change intentional?
We at HardenedBSD are affected as well. Well, time to spend my weekend
resolving merge conflicts.
Seems like any downstream project that relies on the GitHub mirror of
the ports tree will have issues. Major ouch.
Did someone do a force push?
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: Hash changes in the freebsd-ports GitHub mirror
On Fri, Dec 02, 2016 at 10:40:29AM +0100, Raphael Kubo da Costa wrote:
> Hi all,
>
> I tried running `git pull` a few minutes ago and had a ton of conflicts.
>
> It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
> ("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
> now different in all GitHub branches.
>
> Is anyone else experiencing this? Was this change intentional?
We at HardenedBSD are affected as well. Well, time to spend my weekend
resolving merge conflicts.
Seems like any downstream project that relies on the GitHub mirror of
the ports tree will have issues. Major ouch.
Thanks,
--
Shawn Webb
Cofounder and Security Engineer
HardenedBSD
GPG Key ID: 0x6A84658F52456EEE
GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE
signature.asc
Description: PGP signature
Re: Hash changes in the freebsd-ports GitHub mirror
Le 02/12/2016 à 10:40, Raphael Kubo da Costa a écrit :
> Hi all,
>
> I tried running `git pull` a few minutes ago and had a ton of conflicts.
>
> It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
> ("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
> now different in all GitHub branches.
>
> Is anyone else experiencing this? Was this change intentional?
>
It may be related to the fact that the git repository is made from the
public http repository, which is a mirror of the official repository
made with svnmirror (I think?) and that that mirroring thing was
dropping commit that had no files in them. (Aka forced commits.)
Things may have been fixed.
(It's the reason my fork[1] is not really a fork, it was redone using
repo.freebsd.org as its source)
Or maybe it is not related and I don't know what I'm talking about.
1: https://github.com/mat813/freebsd-ports/
--
Mathieu Arnold
signature.asc
Description: OpenPGP digital signature
Hash changes in the freebsd-ports GitHub mirror
Hi all,
I tried running `git pull` a few minutes ago and had a ton of conflicts.
It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5
("fix issues related with USES=fonts" from 2015-07-18, aka r392404) are
now different in all GitHub branches.
Is anyone else experiencing this? Was this change intentional?
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
