[llvm-dev] [cfe-dev] Renaming The Default Branch

Richard Smith via llvm-dev
Wed, 18 Nov 2020 19:45:18 -0000

On Wed, 18 Nov 2020 at 10:55, Mike Edwards via cfe-dev <
cfe-dev at lists.llvm.org> wrote:

> On Mon, Nov 16, 2020 at 6:05 PM Keane, Erich <erich.keane at
intel.com>
> wrote:
>
>> Ah, I see what you mean.  I would have no problem with January 7th
being
>> pushed back a while if that helps out your transition.  Would that be
>> possible Mike?
>>
>
> 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.
>

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?

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.


> *From:* Stephen Hines <srhines at google.com>
>> *Sent:* Monday, November 16, 2020 6:03 PM
>> *To:* Keane, Erich <erich.keane at intel.com>
>> *Cc:* Mehdi AMINI <joker.eph at gmail.com>; llvm-dev <
>> llvm-dev at lists.llvm.org>; clang developer list <cfe-dev at
lists.llvm.org>
>> *Subject:* Re: [llvm-dev] Renaming The Default Branch
>>
>>
>>
>>
>>
>>
>>
>> On Mon, Nov 16, 2020 at 6:00 PM Keane, Erich <erich.keane at
intel.com>
>> wrote:
>>
>> 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…
>>
>>
>>
>> That said, from a downstream-perspective, it looks like we’ll still be
>> keeping ‘master’ updated for a while, right?
>>
>> > We will lock the master branch and change it to be readonly (with
the
>> exception of llvmbot)
>>
>>
>>
>> Is that what I should take from that?
>>
>>
>>
>> """
>>
>> On January 7, 2021:
>> * We will remove the ‘master’ branch from all repositories in the llvm
>> organization
>>
>> """
>>
>>
>>
>> ^ 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.
>>
>>
>>
>> Steve
>>
>>
>>
>>
>>
>> *From:* llvm-dev <llvm-dev-bounces at lists.llvm.org> *On Behalf
Of *Stephen
>> Hines via llvm-dev
>> *Sent:* Monday, November 16, 2020 5:14 PM
>> *To:* Mehdi AMINI <joker.eph at gmail.com>
>> *Cc:* llvm-dev <llvm-dev at lists.llvm.org>
>> *Subject:* Re: [llvm-dev] Renaming The Default Branch
>>
>>
>>
>> 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?
>>
>>
>>
>> Thanks,
>>
>> Steve
>>
>>
>>
>> On Fri, Nov 13, 2020 at 5:10 PM Mehdi AMINI via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>>
>>
>>
>>
>> On Fri, Nov 13, 2020 at 4:53 PM James Y Knight via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>> I notice that on https://github.com/github/renaming it says:
>>
>>
>>
>> """If you haven’t renamed your default branch yet,
consider waiting until later
>> this year <https://github.com/github/renaming#later-this-year>.
We’re
>> investing in tools to make renaming the default branch of an existing
>> repository a seamless experience for both maintainers and
contributors."""
>>
>>
>>
>> Is that not relevant/not useful for us to wait for that?
>>
>>
>>
>> They expand on this at the end of the document:
>>
https://github.com/github/renaming#later-this-year-seamless-move-for-existing-repositories-
>>
>> 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).
>>
>>
>>
>> --
>>
>> Mehdi
>>
>>
>>
>>
>>
>>
>>
>> On Fri, Nov 13, 2020, 6:57 PM Mike Edwards via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>> Hi Everyone,
>>
>> Many tech communities, including GitHub
>> <https://github.com/github/renaming> and Git
>> <https://sfconservancy.org/news/2020/jun/23/gitbranchname/>, have
moved
>> away from term “master branch” and replaced it with “main branch” in an
>>
>> effort to remove unnecessary references to slavery and use more
inclusive
>> terms.  This was also discussed on the LLVM-dev mailing list
>> <https://lists.llvm.org/pipermail/llvm-dev/2020-June/142445.html>
>>
>> and there was strong consensus from LLVM Developers’ that the LLVM
>> Project should also rename our master branch as well. Now that
>>
>> an industry standard name has been selected by GitHub, the LLVM Project
>> can begin the renaming process of the default branch to “main”.
>>
>>
>> *This change will occur at **06:00GMT on Monday December 7, 2020**
(time
>> is **GMT**, please adjust for your local timezone).*
>>
>> To make this as easy as possible we plan to do the following *prior to
>> November 20, 2020*:
>> * Create a new branch named 'test-main' on the llvm-project
repository
>>     * This branch will be read-only except for the llvmbot account
>>     * Setup a GitHub action to mirror commits from 'master' to
>> ‘test-main' automatically
>>     * Allow the configuration to soak for a few days to ensure
everything
>> works
>> * Create a new branch named “main” on the llvm-project repository
>>     * This branch will be readonly initially
>>     * Reuse the previous Github Action to mirror master to main
>>     * This configuration will stay in place until cutover takes place
on
>> Dec. 7
>>
>> *On December 7, 2020*:
>> * We will lock the master branch and change it to be readonly (with the
>> exception of llvmbot)
>> * Switch the GitHub action to mirror commits from the new main branch
>> back to the old master branch
>> * Make a few test commits to ensure the GitHub action is functioning as
>> expected
>> * Open the main branch to commits from community members
>> * In parallel we will begin to work through the rest of the llvm
>> organization repositories to update branch names as well
>> * We will update the developer policy to reflect the change in workflow
>>
>> *On January 7, 2021*:
>> * We will remove the ‘master’ branch from all repositories in the llvm
>> organization
>>
>> 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
>> in order to simulate the cutover. If we encounter any issues we will
>> update the community on llvm-dev.
>> We expect the llvm-project repository to be unavailable to developers
for
>> approximately 1 hour while the
>> switch is made. Lockout will occur promptly at 06:00GMT on the 7th.
>> Certainly if we finish sooner, we will
>> update llvm-dev to let everyone know the repository is available for
use
>> once again.
>>
>> We know this has been a long process and we want to thank everyone for
>> their patience.  We look forward to getting
>> the project completed soon.
>>
>> Respectfully,
>>
>> Mike Edwards
>> On Behalf Of the LLVM Foundation
>>
>> _______________________________________________
>> LLVM Developers mailing list
>> llvm-dev at lists.llvm.org
>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
>> _______________________________________________
>> LLVM Developers mailing list
>> llvm-dev at lists.llvm.org
>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
>> _______________________________________________
>> LLVM Developers mailing list
>> llvm-dev at lists.llvm.org
>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
>> _______________________________________________
> cfe-dev mailing list
> cfe-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20201118/1f55fee4/attachment.html>