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

2021-04-29 Thread Jordan Justen
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

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

2021-03-25 Thread Jason Ekstrand
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: >

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

2021-03-25 Thread Rob Clark
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: >

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

2021-03-25 Thread Jordan Justen
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

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

2021-03-24 Thread Jason Ekstrand
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

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

2021-03-24 Thread Rob Clark
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,

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

2021-03-24 Thread Jordan Justen
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

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

2021-03-23 Thread Eric Anholt
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

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

2021-03-23 Thread Jason Ekstrand
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

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

2020-08-07 Thread Timur Kristóf
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

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

2020-08-06 Thread Eric Engestrom
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

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

2020-08-04 Thread Jason Ekstrand
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

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

2020-08-04 Thread Daniel Stone
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

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

2020-08-03 Thread Eric Engestrom
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,

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Eric Engestrom
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

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Eric Engestrom
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

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

2020-08-03 Thread Ian Romanick
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

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Erik Faye-Lund
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

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Mike Lothian
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

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

2020-08-03 Thread Erik Faye-Lund
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

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

2020-08-03 Thread Kristian Høgsberg
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

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

2020-08-03 Thread Eric Anholt
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

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

2020-08-03 Thread Michel Dänzer
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

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

2020-08-03 Thread Kenneth Graunke
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

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Jason Ekstrand
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

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

2020-08-03 Thread Jason Ekstrand
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.