Re: [Mesa-dev] Rename "master" branch to "main"?
On 2021-03-25 08:11:45, Jason Ekstrand wrote: > On Thu, Mar 25, 2021 at 9:41 AM Rob Clark 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 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Thu, Mar 25, 2021 at 9:41 AM Rob Clark wrote: > > On Wed, Mar 24, 2021 at 9:15 PM Jason Ekstrand wrote: > > > > On March 24, 2021 22:25:10 Rob Clark wrote: > > > >> On Wed, Mar 24, 2021 at 3:52 PM Jordan Justen > >> wrote: > >>> > >>> > >>> On 2021-03-23 09:38:59, Eric Anholt wrote: > > On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand > wrote: > > > > > > Trying to pick this discussion back up. Daniel Stone thinks it's a > > half hour of API bashing to retarget all the MRs so, if the fd.o > > admins have some heads up, it should be tractable. Should we do this > > right after branching 21.1 along with the LTS branch? > > > +1 > >>> > >>> > >>> Jason, > >>> > >>> I opened a related Mesa issue: > >>> https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501 > >>> > >>> I made this change in crucible, and used a script to update the 7 MR > >>> target branches: > >>> https://gitlab.freedesktop.org/mesa/crucible/-/issues/5 > >>> > >>> As mentioned in the Mesa issue, I think we should use piglit as > >>> another test run before changing Mesa: > >>> https://gitlab.freedesktop.org/mesa/piglit/-/issues/50 > >>> > >>> Piglit currently has 60 open merge requests. > >> > >> > >> I'm in favor of branch rename, but was in the camp of "hope gitlab > >> comes up with a way to make this easy for us".. but as far as fallback > >> plan, converting trees with fewer outstanding MRs first seems like a > >> pretty good idea so solid +1 for that > > > > > > If you read enough off the things, you'll see that Jordan wrote a python > > script that re-targets all the open MRs so that's not a manual process. > > It's not a GitLab-sanctioned solution but it's the next best thing. The one > > downside is that all the MRs will get their last updated timestamp reset > > but that seems like a pretty small price to pay. > > > > 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. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Wed, Mar 24, 2021 at 9:15 PM Jason Ekstrand wrote: > > On March 24, 2021 22:25:10 Rob Clark wrote: > >> On Wed, Mar 24, 2021 at 3:52 PM Jordan Justen >> wrote: >>> >>> >>> On 2021-03-23 09:38:59, Eric Anholt wrote: On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand wrote: > > > Trying to pick this discussion back up. Daniel Stone thinks it's a > half hour of API bashing to retarget all the MRs so, if the fd.o > admins have some heads up, it should be tractable. Should we do this > right after branching 21.1 along with the LTS branch? +1 >>> >>> >>> Jason, >>> >>> I opened a related Mesa issue: >>> https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501 >>> >>> I made this change in crucible, and used a script to update the 7 MR >>> target branches: >>> https://gitlab.freedesktop.org/mesa/crucible/-/issues/5 >>> >>> As mentioned in the Mesa issue, I think we should use piglit as >>> another test run before changing Mesa: >>> https://gitlab.freedesktop.org/mesa/piglit/-/issues/50 >>> >>> Piglit currently has 60 open merge requests. >> >> >> I'm in favor of branch rename, but was in the camp of "hope gitlab >> comes up with a way to make this easy for us".. but as far as fallback >> plan, converting trees with fewer outstanding MRs first seems like a >> pretty good idea so solid +1 for that > > > If you read enough off the things, you'll see that Jordan wrote a python > script that re-targets all the open MRs so that's not a manual process. It's > not a GitLab-sanctioned solution but it's the next best thing. The one > downside is that all the MRs will get their last updated timestamp reset but > that seems like a pretty small price to pay. > 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 BR, -R > Jordan, is there any way you can make the script sort by last updated before > it re-targets the MRs so they at least stay in the same order? Updating them > in MR # order wouldn't be bad either, I guess. > > --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On 2021-03-24 21:14:57, Jason Ekstrand wrote: > > Jordan, is there any way you can make the script sort by last updated before > it > re-targets the MRs so they at least stay in the same order? Updating them in > MR > # order wouldn't be bad either, I guess. > It already does process them sorting by the oldest "update time" first, so roughly speaking the order sorted by update time should be the same. I don't know what might happen if 2 MRs were updated within the same second. But, the updates are actually a bit slow (maybe ~1 update per second), so there doesn't seem to be much risk, as far as I can see, of, for instance, 10 updates happening within the same second. -Jordan ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On March 24, 2021 22:25:10 Rob Clark wrote: On Wed, Mar 24, 2021 at 3:52 PM Jordan Justen wrote: On 2021-03-23 09:38:59, Eric Anholt wrote: On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand wrote: Trying to pick this discussion back up. Daniel Stone thinks it's a half hour of API bashing to retarget all the MRs so, if the fd.o admins have some heads up, it should be tractable. Should we do this right after branching 21.1 along with the LTS branch? +1 Jason, I opened a related Mesa issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501 I made this change in crucible, and used a script to update the 7 MR target branches: https://gitlab.freedesktop.org/mesa/crucible/-/issues/5 As mentioned in the Mesa issue, I think we should use piglit as another test run before changing Mesa: https://gitlab.freedesktop.org/mesa/piglit/-/issues/50 Piglit currently has 60 open merge requests. I'm in favor of branch rename, but was in the camp of "hope gitlab comes up with a way to make this easy for us".. but as far as fallback plan, converting trees with fewer outstanding MRs first seems like a pretty good idea so solid +1 for that If you read enough off the things, you'll see that Jordan wrote a python script that re-targets all the open MRs so that's not a manual process. It's not a GitLab-sanctioned solution but it's the next best thing. The one downside is that all the MRs will get their last updated timestamp reset but that seems like a pretty small price to pay. Jordan, is there any way you can make the script sort by last updated before it re-targets the MRs so they at least stay in the same order? Updating them in MR # order wouldn't be bad either, I guess. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Wed, Mar 24, 2021 at 3:52 PM Jordan Justen wrote: > > On 2021-03-23 09:38:59, Eric Anholt wrote: > > On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand wrote: > > > > > > Trying to pick this discussion back up. Daniel Stone thinks it's a > > > half hour of API bashing to retarget all the MRs so, if the fd.o > > > admins have some heads up, it should be tractable. Should we do this > > > right after branching 21.1 along with the LTS branch? > > > > +1 > > Jason, > > I opened a related Mesa issue: > https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501 > > I made this change in crucible, and used a script to update the 7 MR > target branches: > https://gitlab.freedesktop.org/mesa/crucible/-/issues/5 > > As mentioned in the Mesa issue, I think we should use piglit as > another test run before changing Mesa: > https://gitlab.freedesktop.org/mesa/piglit/-/issues/50 > > Piglit currently has 60 open merge requests. I'm in favor of branch rename, but was in the camp of "hope gitlab comes up with a way to make this easy for us".. but as far as fallback plan, converting trees with fewer outstanding MRs first seems like a pretty good idea so solid +1 for that BR, -R ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On 2021-03-23 09:38:59, Eric Anholt wrote: > On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand wrote: > > > > Trying to pick this discussion back up. Daniel Stone thinks it's a > > half hour of API bashing to retarget all the MRs so, if the fd.o > > admins have some heads up, it should be tractable. Should we do this > > right after branching 21.1 along with the LTS branch? > > +1 Jason, I opened a related Mesa issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4501 I made this change in crucible, and used a script to update the 7 MR target branches: https://gitlab.freedesktop.org/mesa/crucible/-/issues/5 As mentioned in the Mesa issue, I think we should use piglit as another test run before changing Mesa: https://gitlab.freedesktop.org/mesa/piglit/-/issues/50 Piglit currently has 60 open merge requests. -Jordan ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Tue, Mar 23, 2021 at 7:02 AM Jason Ekstrand wrote: > > Trying to pick this discussion back up. Daniel Stone thinks it's a > half hour of API bashing to retarget all the MRs so, if the fd.o > admins have some heads up, it should be tractable. Should we do this > right after branching 21.1 along with the LTS branch? +1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
Trying to pick this discussion back up. Daniel Stone thinks it's a half hour of API bashing to retarget all the MRs so, if the fd.o admins have some heads up, it should be tractable. Should we do this right after branching 21.1 along with the LTS branch? --Jason On Fri, Aug 7, 2020 at 3:38 AM Timur Kristóf wrote: > > On Thu, 2020-08-06 at 14:17 +0200, Eric Engestrom wrote: > > > > There is an upstream issue about having gitlab handle the branch > > renaming and provide redirections, MR re-targeting, etc. > > > > https://gitlab.com/gitlab-org/gitlab/-/issues/233427 > > > > If we wait for this feature instead of doing it by hand, it could be > > much less disruptive to devs and everyone downstream from us, but > > there's also no telling how long this will take. > > Sounds like this would save us a lot of hassle. If we are not in a > hurry, I think the best option for us is to wait for this upstream > issue. > > > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Thu, 2020-08-06 at 14:17 +0200, Eric Engestrom wrote: > > There is an upstream issue about having gitlab handle the branch > renaming and provide redirections, MR re-targeting, etc. > > https://gitlab.com/gitlab-org/gitlab/-/issues/233427 > > If we wait for this feature instead of doing it by hand, it could be > much less disruptive to devs and everyone downstream from us, but > there's also no telling how long this will take. Sounds like this would save us a lot of hassle. If we are not in a hurry, I think the best option for us is to wait for this upstream issue. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Tuesday, 2020-08-04 11:27:43 -0500, Jason Ekstrand wrote: > On Tue, Aug 4, 2020 at 5:54 AM Daniel Stone wrote: > > > > Hi, > > > > On Mon, 3 Aug 2020 at 17:16, Jason Ekstrand wrote: > > > On Mon, Aug 3, 2020 at 11:12 AM Kenneth Graunke > > > wrote: > > > > Seems reasonable to me...in the old Subversion days, we called it > > > > 'trunk'...then 'master' with Git...but calling the main development > > > > branch 'main' is arguably the simplest and most descriptive term. > > > > > > > > One thing we'll have to coordinate: getting Gitlab CI / Marge and the > > > > Intel Mesa CI to switch over at the right time, so we don't end up > > > > breaking/interrupting those services. Should be easy, just requires > > > > a bit of coordination. > > > > > > Yup, I threw Daniel onto the CC of this e-mail explicitly for that > > > reason. We may also want to coordinate with the rest of fd.o so that > > > everyone chooses the same new mainline branch name. I just added > > > Michel to the CC as he's doing lots of CI stuff and might be a good > > > person to help coordinate there. I certainly don't want to pull the > > > rug out from under anyone. > > > > That's fine by me. I think 'main' is a perfectly fine name, and we'd > > be happy to encode that in whatever useful way. I suppose the main > > problem with a global nature is the very disparate nature of the > > projects - getting everyone to move at once before we throw the switch > > would require a great deal of effort. But we can figure it out. > > I don't think we need to get everyone to sync up necessarily. It > probably would be good if we had consistency across projects as to > what the primary branch is called. It may also matter from a GitLab > configuration perspective. There's some chatter on the GitLab issue > tracker about allowing different default branch names and I could > imagine them even adding a per-install default default name. I don't > think it's a big deal but something to consider. Here's the GitLab > issue for this: > > https://gitlab.com/gitlab-org/gitlab/-/issues/220906 > > > As for retargeting MRs; if it can be done manually, then it can be > > done automatically as well. We can figure out a way to just > > automatically retarget all the outstanding MRs, but a couple of weeks' > > leadtime would be good right now. > > It sounds like people are ok with manually re-targetting if they have > to. However, if there's a script I can run or coordinate with you to > run, that'd probably make the process smoother. As I've said before, > I don't think we need to rush so if you think that's something someone > could get put together in a couple weeks or a month, I think it's fine > to wait for it. Likely, Mesa isn't the only project on fd.o that's > going to make a change like this so such a script would probably be > pretty useful. There is an upstream issue about having gitlab handle the branch renaming and provide redirections, MR re-targeting, etc. https://gitlab.com/gitlab-org/gitlab/-/issues/233427 If we wait for this feature instead of doing it by hand, it could be much less disruptive to devs and everyone downstream from us, but there's also no telling how long this will take. --- Another option might be to keep `master` updated as a read-only copy of `main`, by having a post-receive hook that looks like this: cat refs/heads/main > refs/heads/master (crude script, can be optimized to only run on `main` changes, but also this is trivially fast so it might be ok to just leave it like this) Since we're planning on keeping `master` around forever, why not have it follow `main`? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Tue, Aug 4, 2020 at 5:54 AM Daniel Stone wrote: > > Hi, > > On Mon, 3 Aug 2020 at 17:16, Jason Ekstrand wrote: > > On Mon, Aug 3, 2020 at 11:12 AM Kenneth Graunke > > wrote: > > > Seems reasonable to me...in the old Subversion days, we called it > > > 'trunk'...then 'master' with Git...but calling the main development > > > branch 'main' is arguably the simplest and most descriptive term. > > > > > > One thing we'll have to coordinate: getting Gitlab CI / Marge and the > > > Intel Mesa CI to switch over at the right time, so we don't end up > > > breaking/interrupting those services. Should be easy, just requires > > > a bit of coordination. > > > > Yup, I threw Daniel onto the CC of this e-mail explicitly for that > > reason. We may also want to coordinate with the rest of fd.o so that > > everyone chooses the same new mainline branch name. I just added > > Michel to the CC as he's doing lots of CI stuff and might be a good > > person to help coordinate there. I certainly don't want to pull the > > rug out from under anyone. > > That's fine by me. I think 'main' is a perfectly fine name, and we'd > be happy to encode that in whatever useful way. I suppose the main > problem with a global nature is the very disparate nature of the > projects - getting everyone to move at once before we throw the switch > would require a great deal of effort. But we can figure it out. I don't think we need to get everyone to sync up necessarily. It probably would be good if we had consistency across projects as to what the primary branch is called. It may also matter from a GitLab configuration perspective. There's some chatter on the GitLab issue tracker about allowing different default branch names and I could imagine them even adding a per-install default default name. I don't think it's a big deal but something to consider. Here's the GitLab issue for this: https://gitlab.com/gitlab-org/gitlab/-/issues/220906 > As for retargeting MRs; if it can be done manually, then it can be > done automatically as well. We can figure out a way to just > automatically retarget all the outstanding MRs, but a couple of weeks' > leadtime would be good right now. It sounds like people are ok with manually re-targetting if they have to. However, if there's a script I can run or coordinate with you to run, that'd probably make the process smoother. As I've said before, I don't think we need to rush so if you think that's something someone could get put together in a couple weeks or a month, I think it's fine to wait for it. Likely, Mesa isn't the only project on fd.o that's going to make a change like this so such a script would probably be pretty useful. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
Hi, On Mon, 3 Aug 2020 at 17:16, Jason Ekstrand wrote: > On Mon, Aug 3, 2020 at 11:12 AM Kenneth Graunke wrote: > > Seems reasonable to me...in the old Subversion days, we called it > > 'trunk'...then 'master' with Git...but calling the main development > > branch 'main' is arguably the simplest and most descriptive term. > > > > One thing we'll have to coordinate: getting Gitlab CI / Marge and the > > Intel Mesa CI to switch over at the right time, so we don't end up > > breaking/interrupting those services. Should be easy, just requires > > a bit of coordination. > > Yup, I threw Daniel onto the CC of this e-mail explicitly for that > reason. We may also want to coordinate with the rest of fd.o so that > everyone chooses the same new mainline branch name. I just added > Michel to the CC as he's doing lots of CI stuff and might be a good > person to help coordinate there. I certainly don't want to pull the > rug out from under anyone. That's fine by me. I think 'main' is a perfectly fine name, and we'd be happy to encode that in whatever useful way. I suppose the main problem with a global nature is the very disparate nature of the projects - getting everyone to move at once before we throw the switch would require a great deal of effort. But we can figure it out. As for retargeting MRs; if it can be done manually, then it can be done automatically as well. We can figure out a way to just automatically retarget all the outstanding MRs, but a couple of weeks' leadtime would be good right now. Cheers, Daniel ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Monday, 2020-08-03 13:42:28 -0500, Jason Ekstrand wrote: > On Mon, Aug 3, 2020 at 1:38 PM Eric Engestrom wrote: > > > > On Monday, 2020-08-03 13:31:19 -0500, Jason Ekstrand wrote: > > > On Mon, Aug 3, 2020 at 1:24 PM Eric Engestrom wrote: > > > > > > > > On Monday, 2020-08-03 10:30:29 -0500, Jason Ekstrand wrote: > > > > > All, > > > > > > > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > > > > chatter around inclusive language in software. While mesa doesn't > > > > > provide a whole lot of documentation (hah!), we do have a website, a > > > > > code-base, and a git repo and this is something that we, as a project > > > > > should consider. > > > > > > > > > > What I'm proposing today is simply re-naming the primary Git branch > > > > > from "master" to "main". Why "main"? Because that's what GitHub has > > > > > chosen "main" as their new default branch name and so it sounds to me > > > > > like the most likely new default. > > > > > > > > > > As far as impact on the project goes, if and when we rename the > > > > > primary branch, the old "master" branch will be locked (no > > > > > pushing/merging allowed) and all MRs will have to be re-targeted > > > > > against the new branch. Fortunately, that's very easy to do. You > > > > > just edit the MR and there's a little drop-down box at the top for > > > > > which branch it targets. I just tested this with one of mine and it > > > > > seems to work ok. > > > > > > > > > > As far as other bits of language in the code-base, I'm happy to see > > > > > those cleaned up as people have opportunity. I'm not aware of any > > > > > particularly egregious offenders. However, changing the name of the > > > > > primary branch is something which will cause a brief hiccup in > > > > > people's development process and so warrants broader discussion. > > > > > > > > > > Thoughts? > > > > > > > > Definite +1 for me on the idea, but we do have a lot of tools and > > > > processes with `master` baked in. I'll try and have a look at everything > > > > to make sure everything supports the transition (some things will need > > > > to support both the old and new names), but assuming no issue there this > > > > would be a really good thing to do, and `main` is a good name. > > > > > > I did some grepping and I noticed that as well. Some of the tools > > > such as the khronos sync scripts will have to change if/when Khronos > > > repos make a similar transition. I expect that to happen but don't > > > have a timeline. I'll try to keep you posted on those. > > > > The external things like Khronos should be easy enough to handle, I was > > more concerned about internal things like the stable branches. > > > > > > > > For the internal ones, if you wanted to make a MR for it, we can > > > either land it with support for both ahead of the switch or we can > > > make it the first commit that goes on the new "main" branch. In any > > > case, I'm not in so much of a hurry that I think we need to make the > > > switch ahead of getting tooling ready. > > > > No hurry either... except a branchpoint like the one happening in 2 > > days is the perfect time to minimize issues, as we could have eg. > > `master` for VERSION<20.2 and `main` for VERSION>=20.2 which would > > make it trivial for tools to know which branch name to use based on > > the VERSION file. > > Pardon me for being a bit daft but what's the issue there? "main" > will contain all of the commits in "master" with exactly the same > SHAs. The tools shouldn't have to make a distinction, I wouldn't > think. What am I missing? Heh, I'm the daft one :] You're right, there's absolutely no issue here! ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 1:38 PM Eric Engestrom wrote: > > On Monday, 2020-08-03 13:31:19 -0500, Jason Ekstrand wrote: > > On Mon, Aug 3, 2020 at 1:24 PM Eric Engestrom wrote: > > > > > > On Monday, 2020-08-03 10:30:29 -0500, Jason Ekstrand wrote: > > > > All, > > > > > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > > > chatter around inclusive language in software. While mesa doesn't > > > > provide a whole lot of documentation (hah!), we do have a website, a > > > > code-base, and a git repo and this is something that we, as a project > > > > should consider. > > > > > > > > What I'm proposing today is simply re-naming the primary Git branch > > > > from "master" to "main". Why "main"? Because that's what GitHub has > > > > chosen "main" as their new default branch name and so it sounds to me > > > > like the most likely new default. > > > > > > > > As far as impact on the project goes, if and when we rename the > > > > primary branch, the old "master" branch will be locked (no > > > > pushing/merging allowed) and all MRs will have to be re-targeted > > > > against the new branch. Fortunately, that's very easy to do. You > > > > just edit the MR and there's a little drop-down box at the top for > > > > which branch it targets. I just tested this with one of mine and it > > > > seems to work ok. > > > > > > > > As far as other bits of language in the code-base, I'm happy to see > > > > those cleaned up as people have opportunity. I'm not aware of any > > > > particularly egregious offenders. However, changing the name of the > > > > primary branch is something which will cause a brief hiccup in > > > > people's development process and so warrants broader discussion. > > > > > > > > Thoughts? > > > > > > Definite +1 for me on the idea, but we do have a lot of tools and > > > processes with `master` baked in. I'll try and have a look at everything > > > to make sure everything supports the transition (some things will need > > > to support both the old and new names), but assuming no issue there this > > > would be a really good thing to do, and `main` is a good name. > > > > I did some grepping and I noticed that as well. Some of the tools > > such as the khronos sync scripts will have to change if/when Khronos > > repos make a similar transition. I expect that to happen but don't > > have a timeline. I'll try to keep you posted on those. > > The external things like Khronos should be easy enough to handle, I was > more concerned about internal things like the stable branches. > > > > > For the internal ones, if you wanted to make a MR for it, we can > > either land it with support for both ahead of the switch or we can > > make it the first commit that goes on the new "main" branch. In any > > case, I'm not in so much of a hurry that I think we need to make the > > switch ahead of getting tooling ready. > > No hurry either... except a branchpoint like the one happening in 2 > days is the perfect time to minimize issues, as we could have eg. > `master` for VERSION<20.2 and `main` for VERSION>=20.2 which would > make it trivial for tools to know which branch name to use based on > the VERSION file. Pardon me for being a bit daft but what's the issue there? "main" will contain all of the commits in "master" with exactly the same SHAs. The tools shouldn't have to make a distinction, I wouldn't think. What am I missing? --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Monday, 2020-08-03 13:31:19 -0500, Jason Ekstrand wrote: > On Mon, Aug 3, 2020 at 1:24 PM Eric Engestrom wrote: > > > > On Monday, 2020-08-03 10:30:29 -0500, Jason Ekstrand wrote: > > > All, > > > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > > chatter around inclusive language in software. While mesa doesn't > > > provide a whole lot of documentation (hah!), we do have a website, a > > > code-base, and a git repo and this is something that we, as a project > > > should consider. > > > > > > What I'm proposing today is simply re-naming the primary Git branch > > > from "master" to "main". Why "main"? Because that's what GitHub has > > > chosen "main" as their new default branch name and so it sounds to me > > > like the most likely new default. > > > > > > As far as impact on the project goes, if and when we rename the > > > primary branch, the old "master" branch will be locked (no > > > pushing/merging allowed) and all MRs will have to be re-targeted > > > against the new branch. Fortunately, that's very easy to do. You > > > just edit the MR and there's a little drop-down box at the top for > > > which branch it targets. I just tested this with one of mine and it > > > seems to work ok. > > > > > > As far as other bits of language in the code-base, I'm happy to see > > > those cleaned up as people have opportunity. I'm not aware of any > > > particularly egregious offenders. However, changing the name of the > > > primary branch is something which will cause a brief hiccup in > > > people's development process and so warrants broader discussion. > > > > > > Thoughts? > > > > Definite +1 for me on the idea, but we do have a lot of tools and > > processes with `master` baked in. I'll try and have a look at everything > > to make sure everything supports the transition (some things will need > > to support both the old and new names), but assuming no issue there this > > would be a really good thing to do, and `main` is a good name. > > I did some grepping and I noticed that as well. Some of the tools > such as the khronos sync scripts will have to change if/when Khronos > repos make a similar transition. I expect that to happen but don't > have a timeline. I'll try to keep you posted on those. The external things like Khronos should be easy enough to handle, I was more concerned about internal things like the stable branches. > > For the internal ones, if you wanted to make a MR for it, we can > either land it with support for both ahead of the switch or we can > make it the first commit that goes on the new "main" branch. In any > case, I'm not in so much of a hurry that I think we need to make the > switch ahead of getting tooling ready. No hurry either... except a branchpoint like the one happening in 2 days is the perfect time to minimize issues, as we could have eg. `master` for VERSION<20.2 and `main` for VERSION>=20.2 which would make it trivial for tools to know which branch name to use based on the VERSION file. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 1:24 PM Eric Engestrom wrote: > > On Monday, 2020-08-03 10:30:29 -0500, Jason Ekstrand wrote: > > All, > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > chatter around inclusive language in software. While mesa doesn't > > provide a whole lot of documentation (hah!), we do have a website, a > > code-base, and a git repo and this is something that we, as a project > > should consider. > > > > What I'm proposing today is simply re-naming the primary Git branch > > from "master" to "main". Why "main"? Because that's what GitHub has > > chosen "main" as their new default branch name and so it sounds to me > > like the most likely new default. > > > > As far as impact on the project goes, if and when we rename the > > primary branch, the old "master" branch will be locked (no > > pushing/merging allowed) and all MRs will have to be re-targeted > > against the new branch. Fortunately, that's very easy to do. You > > just edit the MR and there's a little drop-down box at the top for > > which branch it targets. I just tested this with one of mine and it > > seems to work ok. > > > > As far as other bits of language in the code-base, I'm happy to see > > those cleaned up as people have opportunity. I'm not aware of any > > particularly egregious offenders. However, changing the name of the > > primary branch is something which will cause a brief hiccup in > > people's development process and so warrants broader discussion. > > > > Thoughts? > > Definite +1 for me on the idea, but we do have a lot of tools and > processes with `master` baked in. I'll try and have a look at everything > to make sure everything supports the transition (some things will need > to support both the old and new names), but assuming no issue there this > would be a really good thing to do, and `main` is a good name. I did some grepping and I noticed that as well. Some of the tools such as the khronos sync scripts will have to change if/when Khronos repos make a similar transition. I expect that to happen but don't have a timeline. I'll try to keep you posted on those. For the internal ones, if you wanted to make a MR for it, we can either land it with support for both ahead of the switch or we can make it the first commit that goes on the new "main" branch. In any case, I'm not in so much of a hurry that I think we need to make the switch ahead of getting tooling ready. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Monday, 2020-08-03 10:30:29 -0500, Jason Ekstrand wrote: > All, > > I'm sure by now you've all seen the articles, LKML mails, and other > chatter around inclusive language in software. While mesa doesn't > provide a whole lot of documentation (hah!), we do have a website, a > code-base, and a git repo and this is something that we, as a project > should consider. > > What I'm proposing today is simply re-naming the primary Git branch > from "master" to "main". Why "main"? Because that's what GitHub has > chosen "main" as their new default branch name and so it sounds to me > like the most likely new default. > > As far as impact on the project goes, if and when we rename the > primary branch, the old "master" branch will be locked (no > pushing/merging allowed) and all MRs will have to be re-targeted > against the new branch. Fortunately, that's very easy to do. You > just edit the MR and there's a little drop-down box at the top for > which branch it targets. I just tested this with one of mine and it > seems to work ok. > > As far as other bits of language in the code-base, I'm happy to see > those cleaned up as people have opportunity. I'm not aware of any > particularly egregious offenders. However, changing the name of the > primary branch is something which will cause a brief hiccup in > people's development process and so warrants broader discussion. > > Thoughts? Definite +1 for me on the idea, but we do have a lot of tools and processes with `master` baked in. I'll try and have a look at everything to make sure everything supports the transition (some things will need to support both the old and new names), but assuming no issue there this would be a really good thing to do, and `main` is a good name. Thanks for starting the conversation! ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On 8/3/20 8:30 AM, Jason Ekstrand wrote: > All, > > I'm sure by now you've all seen the articles, LKML mails, and other > chatter around inclusive language in software. While mesa doesn't > provide a whole lot of documentation (hah!), we do have a website, a > code-base, and a git repo and this is something that we, as a project > should consider. > > What I'm proposing today is simply re-naming the primary Git branch > from "master" to "main". Why "main"? Because that's what GitHub has > chosen "main" as their new default branch name and so it sounds to me > like the most likely new default. > > As far as impact on the project goes, if and when we rename the > primary branch, the old "master" branch will be locked (no > pushing/merging allowed) and all MRs will have to be re-targeted > against the new branch. Fortunately, that's very easy to do. You > just edit the MR and there's a little drop-down box at the top for > which branch it targets. I just tested this with one of mine and it > seems to work ok. > > As far as other bits of language in the code-base, I'm happy to see > those cleaned up as people have opportunity. I'm not aware of any > particularly egregious offenders. However, changing the name of the > primary branch is something which will cause a brief hiccup in > people's development process and so warrants broader discussion. I looked at this a week or so ago. My recollection is that there were a couple other instanced of master (that were references to field names in a DRM header) and a couple instances of whitelist / blacklist. Coordinating renaming the field from the DRM header will be fun, but everything else should be trivial... and would make for good newbie tasks. :) > Thoughts? > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 12:51 PM Erik Faye-Lund wrote: > > On Mon, 2020-08-03 at 12:48 -0500, Jason Ekstrand wrote: > > On Mon, Aug 3, 2020 at 12:42 PM Erik Faye-Lund > > wrote: > > > On Mon, 2020-08-03 at 10:30 -0500, Jason Ekstrand wrote: > > > > All, > > > > > > > > I'm sure by now you've all seen the articles, LKML mails, and > > > > other > > > > chatter around inclusive language in software. While mesa > > > > doesn't > > > > provide a whole lot of documentation (hah!), we do have a > > > > website, a > > > > code-base, and a git repo and this is something that we, as a > > > > project > > > > should consider. > > > > > > > > What I'm proposing today is simply re-naming the primary Git > > > > branch > > > > from "master" to "main". Why "main"? Because that's what GitHub > > > > has > > > > chosen "main" as their new default branch name and so it sounds > > > > to me > > > > like the most likely new default. > > > > > > > > As far as impact on the project goes, if and when we rename the > > > > primary branch, the old "master" branch will be locked (no > > > > pushing/merging allowed) and all MRs will have to be re-targeted > > > > against the new branch. Fortunately, that's very easy to > > > > do. You > > > > just edit the MR and there's a little drop-down box at the top > > > > for > > > > which branch it targets. I just tested this with one of mine and > > > > it > > > > seems to work ok. > > > > > > > > As far as other bits of language in the code-base, I'm happy to > > > > see > > > > those cleaned up as people have opportunity. I'm not aware of > > > > any > > > > particularly egregious offenders. However, changing the name of > > > > the > > > > primary branch is something which will cause a brief hiccup in > > > > people's development process and so warrants broader discussion. > > > > > > > > Thoughts? > > > > > > > > > > I'm all for renaming it, but I'm a bit worried about doing it in a > > > way > > > where we don't break all merge-requests... > > > > > > As far as I know, GitLab doesn't allow changing the target-branch > > > of a > > > merge-request, so all pending merge-requests would all of a sudden > > > point to the wrong branch. > > > > No and yes. It doesn't have any way to mass-edit merge requests to > > re-target them. (It does have a mass-edit tool but it doesn't > > support > > that). However, it does support re-targetting individual merge > > requests. I even gave instructions for doing so in my first e-mail. > > :-) > > > > Thanks for pointing that out, I feel kinda stupid now. I was looking > for that feature in the past, and couldn't find it, but surely there it > is! No worries. I was 100% sure it wasn't there too until I looked for it today. Maybe it was added recently? > I guess I should have read more carefully. Updating every merge request > manually should be a totally OK compromise IMO. Cool. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, 2020-08-03 at 12:48 -0500, Jason Ekstrand wrote: > On Mon, Aug 3, 2020 at 12:42 PM Erik Faye-Lund > wrote: > > On Mon, 2020-08-03 at 10:30 -0500, Jason Ekstrand wrote: > > > All, > > > > > > I'm sure by now you've all seen the articles, LKML mails, and > > > other > > > chatter around inclusive language in software. While mesa > > > doesn't > > > provide a whole lot of documentation (hah!), we do have a > > > website, a > > > code-base, and a git repo and this is something that we, as a > > > project > > > should consider. > > > > > > What I'm proposing today is simply re-naming the primary Git > > > branch > > > from "master" to "main". Why "main"? Because that's what GitHub > > > has > > > chosen "main" as their new default branch name and so it sounds > > > to me > > > like the most likely new default. > > > > > > As far as impact on the project goes, if and when we rename the > > > primary branch, the old "master" branch will be locked (no > > > pushing/merging allowed) and all MRs will have to be re-targeted > > > against the new branch. Fortunately, that's very easy to > > > do. You > > > just edit the MR and there's a little drop-down box at the top > > > for > > > which branch it targets. I just tested this with one of mine and > > > it > > > seems to work ok. > > > > > > As far as other bits of language in the code-base, I'm happy to > > > see > > > those cleaned up as people have opportunity. I'm not aware of > > > any > > > particularly egregious offenders. However, changing the name of > > > the > > > primary branch is something which will cause a brief hiccup in > > > people's development process and so warrants broader discussion. > > > > > > Thoughts? > > > > > > > I'm all for renaming it, but I'm a bit worried about doing it in a > > way > > where we don't break all merge-requests... > > > > As far as I know, GitLab doesn't allow changing the target-branch > > of a > > merge-request, so all pending merge-requests would all of a sudden > > point to the wrong branch. > > No and yes. It doesn't have any way to mass-edit merge requests to > re-target them. (It does have a mass-edit tool but it doesn't > support > that). However, it does support re-targetting individual merge > requests. I even gave instructions for doing so in my first e-mail. > :-) > Thanks for pointing that out, I feel kinda stupid now. I was looking for that feature in the past, and couldn't find it, but surely there it is! I guess I should have read more carefully. Updating every merge request manually should be a totally OK compromise IMO. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 12:42 PM Erik Faye-Lund wrote: > > On Mon, 2020-08-03 at 10:30 -0500, Jason Ekstrand wrote: > > All, > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > chatter around inclusive language in software. While mesa doesn't > > provide a whole lot of documentation (hah!), we do have a website, a > > code-base, and a git repo and this is something that we, as a project > > should consider. > > > > What I'm proposing today is simply re-naming the primary Git branch > > from "master" to "main". Why "main"? Because that's what GitHub has > > chosen "main" as their new default branch name and so it sounds to me > > like the most likely new default. > > > > As far as impact on the project goes, if and when we rename the > > primary branch, the old "master" branch will be locked (no > > pushing/merging allowed) and all MRs will have to be re-targeted > > against the new branch. Fortunately, that's very easy to do. You > > just edit the MR and there's a little drop-down box at the top for > > which branch it targets. I just tested this with one of mine and it > > seems to work ok. > > > > As far as other bits of language in the code-base, I'm happy to see > > those cleaned up as people have opportunity. I'm not aware of any > > particularly egregious offenders. However, changing the name of the > > primary branch is something which will cause a brief hiccup in > > people's development process and so warrants broader discussion. > > > > Thoughts? > > > > I'm all for renaming it, but I'm a bit worried about doing it in a way > where we don't break all merge-requests... > > As far as I know, GitLab doesn't allow changing the target-branch of a > merge-request, so all pending merge-requests would all of a sudden > point to the wrong branch. No and yes. It doesn't have any way to mass-edit merge requests to re-target them. (It does have a mass-edit tool but it doesn't support that). However, it does support re-targetting individual merge requests. I even gave instructions for doing so in my first e-mail. :-) --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, 3 Aug 2020 at 18:42, Erik Faye-Lund wrote: > > On Mon, 2020-08-03 at 10:30 -0500, Jason Ekstrand wrote: > > All, > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > chatter around inclusive language in software. While mesa doesn't > > provide a whole lot of documentation (hah!), we do have a website, a > > code-base, and a git repo and this is something that we, as a project > > should consider. > > > > What I'm proposing today is simply re-naming the primary Git branch > > from "master" to "main". Why "main"? Because that's what GitHub has > > chosen "main" as their new default branch name and so it sounds to me > > like the most likely new default. > > > > As far as impact on the project goes, if and when we rename the > > primary branch, the old "master" branch will be locked (no > > pushing/merging allowed) and all MRs will have to be re-targeted > > against the new branch. Fortunately, that's very easy to do. You > > just edit the MR and there's a little drop-down box at the top for > > which branch it targets. I just tested this with one of mine and it > > seems to work ok. > > > > As far as other bits of language in the code-base, I'm happy to see > > those cleaned up as people have opportunity. I'm not aware of any > > particularly egregious offenders. However, changing the name of the > > primary branch is something which will cause a brief hiccup in > > people's development process and so warrants broader discussion. > > > > Thoughts? > > > > I'm all for renaming it, but I'm a bit worried about doing it in a way > where we don't break all merge-requests... > > As far as I know, GitLab doesn't allow changing the target-branch of a > merge-request, so all pending merge-requests would all of a sudden > point to the wrong branch. Unless we have a a plan for somehow making > sure both branches are updated in lock-step in a grace-period or > something like that... > > I dunno. Does anyone have any great ideas for avoiding this problem? > Is that one that can be fixed in GitLab itself? I imagine a lot of projects are going to be making similar changes ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, 2020-08-03 at 10:30 -0500, Jason Ekstrand wrote: > All, > > I'm sure by now you've all seen the articles, LKML mails, and other > chatter around inclusive language in software. While mesa doesn't > provide a whole lot of documentation (hah!), we do have a website, a > code-base, and a git repo and this is something that we, as a project > should consider. > > What I'm proposing today is simply re-naming the primary Git branch > from "master" to "main". Why "main"? Because that's what GitHub has > chosen "main" as their new default branch name and so it sounds to me > like the most likely new default. > > As far as impact on the project goes, if and when we rename the > primary branch, the old "master" branch will be locked (no > pushing/merging allowed) and all MRs will have to be re-targeted > against the new branch. Fortunately, that's very easy to do. You > just edit the MR and there's a little drop-down box at the top for > which branch it targets. I just tested this with one of mine and it > seems to work ok. > > As far as other bits of language in the code-base, I'm happy to see > those cleaned up as people have opportunity. I'm not aware of any > particularly egregious offenders. However, changing the name of the > primary branch is something which will cause a brief hiccup in > people's development process and so warrants broader discussion. > > Thoughts? > I'm all for renaming it, but I'm a bit worried about doing it in a way where we don't break all merge-requests... As far as I know, GitLab doesn't allow changing the target-branch of a merge-request, so all pending merge-requests would all of a sudden point to the wrong branch. Unless we have a a plan for somehow making sure both branches are updated in lock-step in a grace-period or something like that... I dunno. Does anyone have any great ideas for avoiding this problem? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 10:16 AM Eric Anholt wrote: > > On Mon, Aug 3, 2020 at 8:30 AM Jason Ekstrand wrote: > > > > All, > > > > I'm sure by now you've all seen the articles, LKML mails, and other > > chatter around inclusive language in software. While mesa doesn't > > provide a whole lot of documentation (hah!), we do have a website, a > > code-base, and a git repo and this is something that we, as a project > > should consider. > > > > What I'm proposing today is simply re-naming the primary Git branch > > from "master" to "main". Why "main"? Because that's what GitHub has > > chosen "main" as their new default branch name and so it sounds to me > > like the most likely new default. > > > > As far as impact on the project goes, if and when we rename the > > primary branch, the old "master" branch will be locked (no > > pushing/merging allowed) and all MRs will have to be re-targeted > > against the new branch. Fortunately, that's very easy to do. You > > just edit the MR and there's a little drop-down box at the top for > > which branch it targets. I just tested this with one of mine and it > > seems to work ok. > > > > As far as other bits of language in the code-base, I'm happy to see > > those cleaned up as people have opportunity. I'm not aware of any > > particularly egregious offenders. However, changing the name of the > > primary branch is something which will cause a brief hiccup in > > people's development process and so warrants broader discussion. > > > > Thoughts? > > +1 from me Let's go! > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 8:30 AM Jason Ekstrand wrote: > > All, > > I'm sure by now you've all seen the articles, LKML mails, and other > chatter around inclusive language in software. While mesa doesn't > provide a whole lot of documentation (hah!), we do have a website, a > code-base, and a git repo and this is something that we, as a project > should consider. > > What I'm proposing today is simply re-naming the primary Git branch > from "master" to "main". Why "main"? Because that's what GitHub has > chosen "main" as their new default branch name and so it sounds to me > like the most likely new default. > > As far as impact on the project goes, if and when we rename the > primary branch, the old "master" branch will be locked (no > pushing/merging allowed) and all MRs will have to be re-targeted > against the new branch. Fortunately, that's very easy to do. You > just edit the MR and there's a little drop-down box at the top for > which branch it targets. I just tested this with one of mine and it > seems to work ok. > > As far as other bits of language in the code-base, I'm happy to see > those cleaned up as people have opportunity. I'm not aware of any > particularly egregious offenders. However, changing the name of the > primary branch is something which will cause a brief hiccup in > people's development process and so warrants broader discussion. > > Thoughts? +1 from me ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On 2020-08-03 6:15 p.m., Jason Ekstrand wrote: > On Mon, Aug 3, 2020 at 11:12 AM Kenneth Graunke wrote: >> >> Seems reasonable to me...in the old Subversion days, we called it >> 'trunk'...then 'master' with Git...but calling the main development >> branch 'main' is arguably the simplest and most descriptive term. >> >> One thing we'll have to coordinate: getting Gitlab CI / Marge and the >> Intel Mesa CI to switch over at the right time, so we don't end up >> breaking/interrupting those services. Should be easy, just requires >> a bit of coordination. > > Yup, I threw Daniel onto the CC of this e-mail explicitly for that > reason. We may also want to coordinate with the rest of fd.o so that > everyone chooses the same new mainline branch name. I just added > Michel to the CC as he's doing lots of CI stuff and might be a good > person to help coordinate there. AFAICT only the '$CI_COMMIT_REF_NAME == "master"' test in the .gitlab-ci.yml "pages" job definition needs to be extended / changed to cover the new branch name as well / instead. Other than that, no changes should be necessary for Marge or GitLab CI in general. (Failure to adapt the pages job means the public website wouldn't get updated to reflect changes in the tree) -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
Seems reasonable to me...in the old Subversion days, we called it 'trunk'...then 'master' with Git...but calling the main development branch 'main' is arguably the simplest and most descriptive term. One thing we'll have to coordinate: getting Gitlab CI / Marge and the Intel Mesa CI to switch over at the right time, so we don't end up breaking/interrupting those services. Should be easy, just requires a bit of coordination. --Ken signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
On Mon, Aug 3, 2020 at 11:12 AM Kenneth Graunke wrote: > > Seems reasonable to me...in the old Subversion days, we called it > 'trunk'...then 'master' with Git...but calling the main development > branch 'main' is arguably the simplest and most descriptive term. > > One thing we'll have to coordinate: getting Gitlab CI / Marge and the > Intel Mesa CI to switch over at the right time, so we don't end up > breaking/interrupting those services. Should be easy, just requires > a bit of coordination. Yup, I threw Daniel onto the CC of this e-mail explicitly for that reason. We may also want to coordinate with the rest of fd.o so that everyone chooses the same new mainline branch name. I just added Michel to the CC as he's doing lots of CI stuff and might be a good person to help coordinate there. I certainly don't want to pull the rug out from under anyone. --Jason ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Rename "master" branch to "main"?
If it's helpful (I think it is), Google has published the following document as part of their Android developer documentation: https://source.android.com/setup/contribute/respectful-code It provides not only lists of terms but also suggestions for replacements. It's all context-specific, of course, so doing a simple search-and-replace likely isn't going to work. However, I think such documents are helpful for guiding the discussion. --Jason On Mon, Aug 3, 2020 at 10:30 AM Jason Ekstrand wrote: > > All, > > I'm sure by now you've all seen the articles, LKML mails, and other > chatter around inclusive language in software. While mesa doesn't > provide a whole lot of documentation (hah!), we do have a website, a > code-base, and a git repo and this is something that we, as a project > should consider. > > What I'm proposing today is simply re-naming the primary Git branch > from "master" to "main". Why "main"? Because that's what GitHub has > chosen "main" as their new default branch name and so it sounds to me > like the most likely new default. > > As far as impact on the project goes, if and when we rename the > primary branch, the old "master" branch will be locked (no > pushing/merging allowed) and all MRs will have to be re-targeted > against the new branch. Fortunately, that's very easy to do. You > just edit the MR and there's a little drop-down box at the top for > which branch it targets. I just tested this with one of mine and it > seems to work ok. > > As far as other bits of language in the code-base, I'm happy to see > those cleaned up as people have opportunity. I'm not aware of any > particularly egregious offenders. However, changing the name of the > primary branch is something which will cause a brief hiccup in > people's development process and so warrants broader discussion. > > Thoughts? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Rename "master" branch to "main"?
All, I'm sure by now you've all seen the articles, LKML mails, and other chatter around inclusive language in software. While mesa doesn't provide a whole lot of documentation (hah!), we do have a website, a code-base, and a git repo and this is something that we, as a project should consider. What I'm proposing today is simply re-naming the primary Git branch from "master" to "main". Why "main"? Because that's what GitHub has chosen "main" as their new default branch name and so it sounds to me like the most likely new default. As far as impact on the project goes, if and when we rename the primary branch, the old "master" branch will be locked (no pushing/merging allowed) and all MRs will have to be re-targeted against the new branch. Fortunately, that's very easy to do. You just edit the MR and there's a little drop-down box at the top for which branch it targets. I just tested this with one of mine and it seems to work ok. As far as other bits of language in the code-base, I'm happy to see those cleaned up as people have opportunity. I'm not aware of any particularly egregious offenders. However, changing the name of the primary branch is something which will cause a brief hiccup in people's development process and so warrants broader discussion. Thoughts? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
