Date: Sun, 6 Dec 2020 09:51:17 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> To: git@freebsd.org Subject: HEADS UP: src hashes will respin/change this Sunday Message-ID: <X8ybheba365o%2Byuw@acme.spoerlein.net>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X8ybheba365o%2Byuw>