[llvm-dev] Renaming The Default Branch

[Nathan James via llvm-dev]

Hi,

I'm noticing some issues using arcanist to land patches now that we've
migrated to using main instead of master.

Using `arc land` It seems to be trying to fetch and squash changes from
master instead of main. 

Using `arc land hold`, It says to push the changes use ` $ git push --
origin 0956df44acc3:refs/heads/master`
Again refering to master instead of main.

Trying to push to main manually often seems to result in conflicts and
the push not suceeding.

~Nathan

On Sun, 2020-12-06 at 22:38 -0800, Mike Edwards via llvm-dev wrote:
> Hello,
> The change to the default branch setting has been completed.  The new
> default branch for the llvm-project is now 'main'.  Pushes to the
> 'master' branch will no longer be accepted.  Please update your
> workflow to use the new 'main' branch.  Thank you for your patience
> and cooperation during this process.  I hope everyone has a nice,
> productive day.
> 
> Respectfully,
> 
> Mike Edwards
> On Behalf Of the LLVM Foundation
> 
> On Sun, Dec 6, 2020 at 9:54 PM Mike Edwards <mike at sqlby.me> wrote:
> > Hello,
> > This is a reminder the process to rename the default branch to main
> > will begin in approximately 10 minutes.  An update will be sent to
> > the lists once the process has been completed and the branch is
> > open to receive new commits.
> > 
> > Thanks,
> > Mike Edwards
> > 
> > On Fri, Nov 13, 2020 at 3:56 PM Mike Edwards <mike at sqlby.me> wrote:
> > > Hi Everyone,
> > > Many tech communities, including GitHub and Git, 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
> > > 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