[Mesa-dev] Rename "master" branch to "main"?

Jordan Justen jordan.l.justen at intel.com
Thu Apr 29 17:28:47 UTC 2021


On 2021-03-25 08:11:45, Jason Ekstrand wrote:
> On Thu, Mar 25, 2021 at 9:41 AM Rob Clark <robdclark at gmail.com> wrote:
> >
> > yeah, I meant to convert a repo w/ more MRs than 7 but less than mesa
> > using the script to beta test that, wasn't suggesting to do it by hand
> 
> Plan is to convert piglit next.  It's sitting at about 60 open MRs.
> 

Piglit's conversion went through last month without any issues.
Therefore I opened an MR for mesa:

https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10474

This MR makes some changes to the tree to rename the branch, and it
adds an empty warning message commit. This warning message will live
as the last commit on the upstream master branch for the forseeable
future as a notice to developers that they need to change the upstream
tracking ref to main.

We also have a related issue open to track some other tasks related to
the rename:

https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501

Timing wise, it's probably about the best time around now to maximize
the time before the next release branchpoint.

Regarding the 21.1 release, I think there could be arguments for
before or after. One reason to go before the release is to work out
any kinks before the potentially more urgent 20.1.1 release. But,
before or after, I think Eric and Dylan will be more than capable of
doing some extra checks to verify that the scripts are working for the
stable branches.

-Jordan


More information about the mesa-dev mailing list