On 2/8/26 15:25, Peter Hutterer wrote:
On Sun, Feb 08, 2026 at 01:59:20PM -0800, Alan Coopersmith wrote:
So far no one has said we shouldn't do this, so I've created a couple MR's
to implement it:
Populate the main branch:
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2126
Mark the master branch as closed:
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2127
Seeing no objections, I merged these today. The main branch should be
considered open for merging MR's and the master branch closed.
(If anyone has pointers on what we need to do in gitlab to mark the main
branch as the default branch, please send them to me.)
that one is an easy one :)
https://gitlab.freedesktop.org/xorg/xserver/-/settings/repository#branch-defaults-settings
Thanks for the pointer!
Unfortunately, doing that now breaks our ability to modify branches in MR's
that still target the master branch, so while I've created a branch rule for
the master branch, it's currently set to allow maintainers & developers to
push/merge. I'll change that once we finish retargeting all the open MR's
from master to main.
Fortunately, deleting the CI pipeline config in the master branch means that
merges to that branch are still blocked by the "Pipeline must succeed" setting
in our merge request configs.
--
-Alan Coopersmith- [email protected]
Oracle Solaris Engineering - https://blogs.oracle.com/solaris
