On Fri, Dec 02, 2016 at 04:08:23PM +0000, 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/000074.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