<div dir="ltr"><div>Hi,</div><div>I have added a page to the Foundation's website which will provide updates on the progress of renaming the default branch. The page may be found here: <a href="https://foundation.llvm.org/docs/branch-rename/">https://foundation.llvm.org/docs/branch-rename/</a> . As of right now, we are on track to change the default branch to main on December 7th. Hope everyone is well and staying safe.</div><div><br></div><div>Thanks,</div><div>Mike<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Nov 18, 2020 at 2:09 PM Mike Edwards <<a href="mailto:mike@sqlby.me">mike@sqlby.me</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Nov 18, 2020 at 11:45 AM Richard Smith <<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr">On Wed, 18 Nov 2020 at 10:55, Mike Edwards via cfe-dev <<a href="mailto:cfe-dev@lists.llvm.org" target="_blank">cfe-dev@lists.llvm.org</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr">On Mon, Nov 16, 2020 at 6:05 PM Keane, Erich <<a href="mailto:erich.keane@intel.com" target="_blank">erich.keane@intel.com</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div lang="EN-US">
<div>
<p class="MsoNormal">Ah, I see what you mean. I would have no problem with January 7<sup>th</sup> being pushed back a while if that helps out your transition. Would that be possible Mike?</p></div></div></blockquote><div><br></div><div>The main reason for holding such a tight schedule is we do not want this to drag on forever. I will freely admit, in my zeal to get this project completed, I overlooked the Holiday aspect. My apologies. So, how about we say we will leave the 'master' branch available in read-only mode until January 28th, 2021? This should give everyone plenty of time to make the transition.</div></div></div></blockquote><div><br></div><div>Do we expect github to fail to meet their claimed timeline of providing a seamless workflow for renaming the main branch by the end of the year?</div><div><br></div><div>If we're delaying until the end of January anyway, we'll probably get to our goal *faster* if we wait for the github main branch renaming facility to be available and use it than if we invent our own process.</div></div></div></blockquote><div><br></div><div>The only delay is the deletion of the 'master' branch. The move to the new 'main' branch will still happen on December 7, 2020. Several people have looked into the tooling GitHub will offer and I believe the solution Tom Stellard has come up with is fine for our purposes. Mehdi expanded on this in a previous response to a similar question posed by James.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div lang="EN-US"><div><p class="MsoNormal"><u></u></p>
<p class="MsoNormal"><b>From:</b> Stephen Hines <<a href="mailto:srhines@google.com" target="_blank">srhines@google.com</a>> <br>
<b>Sent:</b> Monday, November 16, 2020 6:03 PM<br>
<b>To:</b> Keane, Erich <<a href="mailto:erich.keane@intel.com" target="_blank">erich.keane@intel.com</a>><br>
<b>Cc:</b> Mehdi AMINI <<a href="mailto:joker.eph@gmail.com" target="_blank">joker.eph@gmail.com</a>>; llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>>; clang developer list <<a href="mailto:cfe-dev@lists.llvm.org" target="_blank">cfe-dev@lists.llvm.org</a>><br>
<b>Subject:</b> Re: [llvm-dev] Renaming The Default Branch<u></u><u></u></p>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal">On Mon, Nov 16, 2020 at 6:00 PM Keane, Erich <<a href="mailto:erich.keane@intel.com" target="_blank">erich.keane@intel.com</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin-left:4.8pt;margin-right:0in">
<div>
<div>
<p class="MsoNormal">This timing actually is likely to be more convenient for my downstreams, as most of the devs will be away.That way we can ‘ease’ into our transition with a limited number of devs
being affected by it…<u></u><u></u></p>
<p class="MsoNormal"> <u></u><u></u></p>
<p class="MsoNormal">That said, from a downstream-perspective, it looks like we’ll still be keeping ‘master’ updated for a while, right?
<u></u><u></u></p>
<p class="MsoNormal">> We will lock the master branch and change it to be readonly (with the exception of llvmbot)<u></u><u></u></p>
<p class="MsoNormal"> <u></u><u></u></p>
<p class="MsoNormal">Is that what I should take from that? <u></u><u></u></p>
</div>
</div>
</blockquote>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">"""<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">On January 7, 2021:<br>
* We will remove the ‘master’ branch from all repositories in the llvm organization<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">"""<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">^ This is the part that will likely break other users, and it seems that `master` will only get updated from December 7 -> January 7. After that, it's gone.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Steve<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin-left:4.8pt;margin-right:0in">
<div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
<p class="MsoNormal"><b>From:</b> llvm-dev <<a href="mailto:llvm-dev-bounces@lists.llvm.org" target="_blank">llvm-dev-bounces@lists.llvm.org</a>>
<b>On Behalf Of </b>Stephen Hines via llvm-dev<br>
<b>Sent:</b> Monday, November 16, 2020 5:14 PM<br>
<b>To:</b> Mehdi AMINI <<a href="mailto:joker.eph@gmail.com" target="_blank">joker.eph@gmail.com</a>><br>
<b>Cc:</b> llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>><br>
<b>Subject:</b> Re: [llvm-dev] Renaming The Default Branch<u></u><u></u></p>
<p class="MsoNormal"> <u></u><u></u></p>
<div>
<p class="MsoNormal">I'm very supportive of this switch, but I do think that the timing leaves a bit to be desired. Many people will be taking time off for the holidays at the end of the year, and forcing
a change to be complete by week 1 of the new year (since January 7 is part of our first work-week in 2021), might make things more difficult than they should be. This is also problematic because lots of organizations might be subject to production freezes
during this time, so they won't be able to do as much testing as they would want before having to switch over. Could we perhaps push back the end date by 2-4 weeks to ensure that nobody has to work through the holidays and/or have an extra stressful first
work-week of 2021?<u></u><u></u></p>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Thanks,<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Steve<u></u><u></u></p>
</div>
</div>
<p class="MsoNormal"> <u></u><u></u></p>
<div>
<div>
<p class="MsoNormal">On Fri, Nov 13, 2020 at 5:10 PM Mehdi AMINI via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin:5pt 0in 5pt 4.8pt">
<div>
<div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<p class="MsoNormal"> <u></u><u></u></p>
<div>
<div>
<p class="MsoNormal">On Fri, Nov 13, 2020 at 4:53 PM James Y Knight via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin:5pt 0in 5pt 4.8pt">
<div>
<div>
<p class="MsoNormal">I notice that on
<a href="https://github.com/github/renaming" target="_blank">https://github.com/github/renaming</a> it says:<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><b> </b><u></u><u></u></p>
</div>
<p class="MsoNormal">"""If you haven’t renamed your default branch yet, consider waiting until
<a href="https://github.com/github/renaming#later-this-year" target="_blank">later this year</a>. We’re investing in tools to make renaming the default branch of an existing repository a seamless experience for both maintainers and contributors."""<u></u><u></u></p>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Is that not relevant/not useful for us to wait for that?<u></u><u></u></p>
</div>
</div>
</blockquote>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">They expand on this at the end of the document: <a href="https://github.com/github/renaming#later-this-year-seamless-move-for-existing-repositories-" target="_blank">https://github.com/github/renaming#later-this-year-seamless-move-for-existing-repositories-</a><u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">None of the items seemed particularly helpful. The main feature I'd have wanted would have a server side mirroring of main to master, but we can emulate this with a github action
(as Mike plans to do).<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">-- <u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Mehdi<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin:5pt 0in 5pt 4.8pt">
<div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<p class="MsoNormal"> <u></u><u></u></p>
<div>
<div>
<p class="MsoNormal">On Fri, Nov 13, 2020, 6:57 PM Mike Edwards via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin:5pt 0in 5pt 4.8pt">
<div>
<p class="MsoNormal">Hi Everyone,<u></u><u></u></p>
<div>
<p class="MsoNormal">Many tech communities, including <a href="https://github.com/github/renaming" target="_blank">GitHub</a> and <a href="https://sfconservancy.org/news/2020/jun/23/gitbranchname/" target="_blank">Git</a>,
have moved away from term “master branch” and replaced it with “main branch” in an<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">effort to remove unnecessary references to slavery and use more inclusive terms. This was also discussed on the <a href="https://lists.llvm.org/pipermail/llvm-dev/2020-June/142445.html" target="_blank">LLVM-dev
mailing list</a><u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">and there was strong consensus from LLVM Developers’ that the LLVM Project should also rename our master branch as well. Now that<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">an industry standard name has been selected by GitHub, the LLVM Project can begin the renaming process of the default branch to “main”. <u></u><u></u></p>
</div>
<p class="MsoNormal"><br>
<b>This change will occur at **06:00GMT on Monday December 7, 2020** (time is **GMT**, please adjust for your local timezone).</b><br>
<br>
To make this as easy as possible we plan to do the following <b>prior to November 20, 2020</b>:<br>
* Create a new branch named 'test-main' on the llvm-project repository<br>
* This branch will be read-only except for the llvmbot account<br>
* Setup a GitHub action to mirror commits from 'master' to ‘test-main' automatically<br>
* Allow the configuration to soak for a few days to ensure everything works<br>
* Create a new branch named “main” on the llvm-project repository<br>
* This branch will be readonly initially<br>
* Reuse the previous Github Action to mirror master to main<br>
* This configuration will stay in place until cutover takes place on Dec. 7 <br>
<br>
<b>On December 7, 2020</b>:<br>
* We will lock the master branch and change it to be readonly (with the exception of llvmbot)<br>
* Switch the GitHub action to mirror commits from the new main branch back to the old master branch<br>
* Make a few test commits to ensure the GitHub action is functioning as expected<br>
* Open the main branch to commits from community members<br>
* In parallel we will begin to work through the rest of the llvm organization repositories to update branch names as well<br>
* We will update the developer policy to reflect the change in workflow<br>
<br>
<b>On January 7, 2021</b>:<br>
* We will remove the ‘master’ branch from all repositories in the llvm organization<br>
<br>
As we work towards December 7, 2020 we are going to set up a test of this system on a fork of the llvm-project<br>
in order to simulate the cutover. If we encounter any issues we will update the community on llvm-dev.<br>
We expect the llvm-project repository to be unavailable to developers for approximately 1 hour while the<br>
switch is made. Lockout will occur promptly at 06:00GMT on the 7th. Certainly if we finish sooner, we will<br>
update llvm-dev to let everyone know the repository is available for use once again.<br>
<br>
We know this has been a long process and we want to thank everyone for their patience. We look forward to getting<br>
the project completed soon.<br>
<br>
Respectfully,<br>
<br>
Mike Edwards<br>
On Behalf Of the LLVM Foundation<u></u><u></u></p>
</div>
<p class="MsoNormal">_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></p>
</blockquote>
</div>
</div>
<p class="MsoNormal">_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></p>
</blockquote>
</div>
</div>
</div>
<p class="MsoNormal">_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><u></u><u></u></p>
</blockquote>
</div>
</div>
</div>
</blockquote>
</div>
</div>
</div>
</div>
</blockquote></div></div>
_______________________________________________<br>
cfe-dev mailing list<br>
<a href="mailto:cfe-dev@lists.llvm.org" target="_blank">cfe-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev</a><br>
</blockquote></div></div>
</blockquote></div></div>
</blockquote></div>