Date: Sun, 6 Dec 2020 18:33:34 +0100 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: git@freebsd.org Subject: Re: HEADS UP: src hashes will respin/change this Sunday Message-ID: <CAJ9axoT4sQwGuivDMe09Y-fdh4gGQ29VNFqOOmQdy8k3R2LLxA@mail.gmail.com> In-Reply-To: <X8ybheba365o%2Byuw@acme.spoerlein.net> References: <X8ybheba365o%2Byuw@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Dec 6, 2020 at 9:51 AM Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wrote= : > Folks, > > it's with a heavy heart that I have to announce that I will need to push > new hashes to cgit-beta.FreeBSD.org/src today. SVN is the gift that > keeps on giving and the converter missed 2 vendor merge commits in > October. > > The history till early October will not change, but afterwards the > upstream's `main` will diverge from what ya'll have checked out > currently. > > To be clear, the _content_ of the commits stays the same, but additional > metadata in the form of a 2nd parent will appear on 2 commits. For local > work you should be able to just merge the new origin/main into your work > (you may never push such a branch to the final repo though), or > rebase/cherry-pick your work onto the new origin/main (you may push such > a linear history to the official repos later). > > Please don't hesitate to reach out should you need help with that. > Also note that this has NOT been pushed yet, I'm doing more testing and > verification and there's a slight chance this might run into Monday. > > Sorry folks, > Uli > This has _now_ been pushed. Sorry for the inconvenience, the converter will not make that same mistake again, that's for sure :) Cheers Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoT4sQwGuivDMe09Y-fdh4gGQ29VNFqOOmQdy8k3R2LLxA>