Re: [Emc-developers] Using `main` instead of `master` branch
On Tue, Jul 27, 2021 at 07:53:54PM +, Alec Ari via Emc-developers wrote: > Hi everyone, > > Are there plans to switch the master branch to main? Just curious. I saw they > changed it for the Mesa3D git repo and that's the default now for Github. I'm not opposed to it. We'll want to make sure that buildbot understands the change, and update documentation, so it's not something that is without small cost; But before long I think people will be surprised and confused by the old names, just as some people experience surprise the first few times they ran into the new name for the default branch. (For my work we've converted hundreds of repos over, and had little trouble from developers and a bit more trouble from scripts & automation) I will be happy to pitch in with the technical steps on github and advise developers on what they need to do after the change. Jeff ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
On Wed, 28 Jul 2021 at 16:14, Jeff Epler wrote: > I'm not opposed to it. I object to objecting to "master". The word itself has so many meanings unrelated to a particular period in the millenia through which the slave trade existed. My school had a headmaster. The UK judiciary has a "Master of the Rolls". "Master" does not imply "and slave"[1] I also object to "Main" as it isn't. Neither name accurately describes the "development" branch. Current "master" is in no sense the "master". Changes in "master" do not propagate into the released branches. I support changing the name to more accurately describe the branch as the development branch, and propose "dev" [1] As a small-case sub-note: This objection to "master" is US cultural imperialism, based on _your_ history. -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
I'm fine with anything but `dev` is probably the best choice due to a better representation of the purpose that branch serves. I fully agree. Alec On Thursday, July 29, 2021, 01:30:46 AM UTC, andy pugh wrote: I also object to "Main" as it isn't. Neither name accurately describes the "development" branch. Current "master" is in no sense the "master". Changes in "master" do not propagate into the released branches. I support changing the name to more accurately describe the branch as the development branch, and propose "dev" ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
From: andy pugh Sent: July 29, 2021 1:29 AM To: EMC developers Subject: Re: [Emc-developers] Using `main` instead of `master` branch On Wed, 28 Jul 2021 at 16:14, Jeff Epler wrote: > I'm not opposed to it. I object to objecting to "master". The word itself has so many meanings unrelated to a particular period in the millenia through which the slave trade existed. My school had a headmaster. The UK judiciary has a "Master of the Rolls". "Master" does not imply "and slave"[1] I also object to "Main" as it isn't. Neither name accurately describes the "development" branch. Seems like another solution looking for a problem. Do we really need to waste our time changing names and breaking things just to pick another work that essentially means the same thing? Let's not waste the little development energy we have. Chris ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
I wonder why github even wants to change it? I think that's dumb... On 7/29/2021 12:03 PM, Johannes Fassotte wrote: I really wish that everyone would concentrate on improving the software instead of worrying about the name of the version that most consider as being the master. It is master since it is where the code is actually shared with everyone. It is not beneficial to anyone to have a narrow view for the word master. There is absolutely no reason to change it to anything. The developers are actually the masters since they hold the various development versions that get merged into what is know as the "master" used for distribution. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
For those who desire more background, both on the motivation and on the breadth of organizations that are choosing to make this change: [some links are about ending use of the M/S terms in electrical interfaces, which is also a thing that is being addressed] https://www.acm.org/diversity-inclusion/words-matter https://sfconservancy.org/news/2020/jun/23/gitbranchname/ https://www.nytimes.com/2021/04/13/technology/racist-computer-engineering-terms-ietf.html https://www.mail-archive.com/python-dev@python.org/msg111965.html https://standards.ieee.org/about/sasb/resolutions.html (search December 2020 in page) https://www.linuxfoundation.org/en/blog/master-slave-and-the-fight-over-offensive-terms-in-computing-kate-conger-new-york-times-april-13-2021/ https://betterprogramming.pub/github-replacing-master-with-main-is-a-huge-win-for-inclusion-in-tech-bf517478275b https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ https://www.sparkfun.com/spi_signal_names https://www.eetimes.com/its-time-for-ieee-to-retire-master-slave/ https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/ https://cdm.link/2020/06/lets-dump-master-slave-terms/ https://blog.adafruit.com/2020/07/12/the-linux-kernel-has-now-adopted-inclusive-language/ Jeff ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
On 7/29/21 2:18 PM, Jeff Epler wrote: For those who desire more background, both on the motivation and on the breadth of organizations that are choosing to make this change: The buildbot and surrounding scripts will need minimal updates to implement this change. The buildbot deb archive will need a minor reorg, which means users will need to update their sources.list. I volunteer to do this work. -- Sebastian Kuzminsky ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
My personal opinion is that this sort of thing is taking PC to extremes and if anything it's a backward step. Trying to bury the words doesn't change what has happened and is still happening around the world. Just trying to forget and pretend slavery never happened isn't the way to go. However this is personal opinion and I don't feel strongly enough about the change to object either way. Trying to be too PC can actually be offensive to minorities. I live in a predominantly white area and have a black friend. One thing he really hates is when people tiptoe around him due to his colour. For example we went into a cafe and ordered coffee. The person serving asked 'do you want bla...er, without milk or with?'. It may not sound like much but that immediately makes him 'other' - someone you need to be careful around. We're all just people. Sorry, I'll get off my soap box now. Les On 29/07/2021 21:18, Jeff Epler wrote: For those who desire more background, both on the motivation and on the breadth of organizations that are choosing to make this change: [some links are about ending use of the M/S terms in electrical interfaces, which is also a thing that is being addressed] https://www.acm.org/diversity-inclusion/words-matter https://sfconservancy.org/news/2020/jun/23/gitbranchname/ https://www.nytimes.com/2021/04/13/technology/racist-computer-engineering-terms-ietf.html https://www.mail-archive.com/python-dev@python.org/msg111965.html https://standards.ieee.org/about/sasb/resolutions.html (search December 2020 in page) https://www.linuxfoundation.org/en/blog/master-slave-and-the-fight-over-offensive-terms-in-computing-kate-conger-new-york-times-april-13-2021/ https://betterprogramming.pub/github-replacing-master-with-main-is-a-huge-win-for-inclusion-in-tech-bf517478275b https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ https://www.sparkfun.com/spi_signal_names https://www.eetimes.com/its-time-for-ieee-to-retire-master-slave/ https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/ https://cdm.link/2020/06/lets-dump-master-slave-terms/ https://blog.adafruit.com/2020/07/12/the-linux-kernel-has-now-adopted-inclusive-language/ Jeff ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
i'm with Les. Slavery has not been a feature of our culture. Heck his country shipped us off as convicts! In this case, the minority are taking a very narrow minded definition to suit their own purposes. It would mean I could no longer be a jack of all trades and master of none. I could not train to be a Master Chef or become a Plumber and join the Master Plumbers Association How could I master the art of Kung Fu? And I would lose fond childhood memories about the excitement of receiving a letter addressed to Master R Webster as it inferred somebody thought I was becoming a young man instead of the old one I've now become! There are far more definitions of master that the minority would have us believe. Its clear to me that its possible to be a master without any slaves to do your bidding as demonstrated above. It seems software is one of them. Rod Webster *1300 896 832* +61 435 765 611 Vehicle Modifications Network www.vehiclemods.net.au On Fri, 30 Jul 2021 at 23:40, Les Newell wrote: > My personal opinion is that this sort of thing is taking PC to extremes > and if anything it's a backward step. Trying to bury the words doesn't > change what has happened and is still happening around the world. Just > trying to forget and pretend slavery never happened isn't the way to go. > > However this is personal opinion and I don't feel strongly enough about > the change to object either way. > > Trying to be too PC can actually be offensive to minorities. I live in a > predominantly white area and have a black friend. One thing he really > hates is when people tiptoe around him due to his colour. For example we > went into a cafe and ordered coffee. The person serving asked 'do you > want bla...er, without milk or with?'. It may not sound like much but > that immediately makes him 'other' - someone you need to be careful > around. We're all just people. Sorry, I'll get off my soap box now. > > Les > > > On 29/07/2021 21:18, Jeff Epler wrote: > > For those who desire more background, both on the motivation and on the > > breadth of organizations that are choosing to make this change: > > > > [some links are about ending use of the M/S terms in electrical > > interfaces, which is also a thing that is being addressed] > > > > https://www.acm.org/diversity-inclusion/words-matter > > https://sfconservancy.org/news/2020/jun/23/gitbranchname/ > > > https://www.nytimes.com/2021/04/13/technology/racist-computer-engineering-terms-ietf.html > > https://www.mail-archive.com/python-dev@python.org/msg111965.html > > https://standards.ieee.org/about/sasb/resolutions.html (search December > 2020 in page) > > > https://www.linuxfoundation.org/en/blog/master-slave-and-the-fight-over-offensive-terms-in-computing-kate-conger-new-york-times-april-13-2021/ > > > https://betterprogramming.pub/github-replacing-master-with-main-is-a-huge-win-for-inclusion-in-tech-bf517478275b > > > https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language > > https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ > > https://www.sparkfun.com/spi_signal_names > > https://www.eetimes.com/its-time-for-ieee-to-retire-master-slave/ > > https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/ > > https://cdm.link/2020/06/lets-dump-master-slave-terms/ > > > https://blog.adafruit.com/2020/07/12/the-linux-kernel-has-now-adopted-inclusive-language/ > > > > Jeff > > > > > > ___ > > Emc-developers mailing list > > Emc-developers@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/emc-developers > > > > > ___ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
As Rod said, being a Master, like a master of a trade, is not a bad thing. Where it gets bad is the slavery part, so I can fully understand that one wants to get rid of all master/ slave namings. In case of the branch name “master”, I don’t see any branch’s named slave, so where’s the connection from master to slavery. From a technical point I can only agree to the others. Changing names in software is often a pain. If names within code are changed it can at least improve readability. But the branch name doesn’t change much… I would rather like to see a new feature in software, like the variables which provide machine coordinates as discussed in the other thread. Michael > On 30. Jul 2021, at 16:36, Rod Webster wrote: > > i'm with Les. Slavery has not been a feature of our culture. Heck his > country shipped us off as convicts! > In this case, the minority are taking a very narrow minded definition > to suit their own purposes. > > It would mean I could no longer be a jack of all trades and master of none. > I could not train to be a Master Chef or become a Plumber and join the > Master Plumbers Association > How could I master the art of Kung Fu? > And I would lose fond childhood memories about the excitement of receiving > a letter addressed to > Master R Webster as it inferred somebody thought I was becoming a young man > instead of the old one I've now become! > > There are far more definitions of master that the minority would have us > believe. > Its clear to me that its possible to be a master without any slaves to do > your bidding as demonstrated above. > It seems software is one of them. > > Rod Webster > *1300 896 832* > +61 435 765 611 > Vehicle Modifications Network > www.vehiclemods.net.au > > >> On Fri, 30 Jul 2021 at 23:40, Les Newell wrote: >> My personal opinion is that this sort of thing is taking PC to extremes >> and if anything it's a backward step. Trying to bury the words doesn't >> change what has happened and is still happening around the world. Just >> trying to forget and pretend slavery never happened isn't the way to go. >> However this is personal opinion and I don't feel strongly enough about >> the change to object either way. >> Trying to be too PC can actually be offensive to minorities. I live in a >> predominantly white area and have a black friend. One thing he really >> hates is when people tiptoe around him due to his colour. For example we >> went into a cafe and ordered coffee. The person serving asked 'do you >> want bla...er, without milk or with?'. It may not sound like much but >> that immediately makes him 'other' - someone you need to be careful >> around. We're all just people. Sorry, I'll get off my soap box now. >> Les >>> On 29/07/2021 21:18, Jeff Epler wrote: >>> For those who desire more background, both on the motivation and on the >>> breadth of organizations that are choosing to make this change: >>> [some links are about ending use of the M/S terms in electrical >>> interfaces, which is also a thing that is being addressed] >>> https://www.acm.org/diversity-inclusion/words-matter >>> https://sfconservancy.org/news/2020/jun/23/gitbranchname/ >> https://www.nytimes.com/2021/04/13/technology/racist-computer-engineering-terms-ietf.html >>> https://www.mail-archive.com/python-dev@python.org/msg111965.html >>> https://standards.ieee.org/about/sasb/resolutions.html (search December >> 2020 in page) >> https://www.linuxfoundation.org/en/blog/master-slave-and-the-fight-over-offensive-terms-in-computing-kate-conger-new-york-times-april-13-2021/ >> https://betterprogramming.pub/github-replacing-master-with-main-is-a-huge-win-for-inclusion-in-tech-bf517478275b >> https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language >>> https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ >>> https://www.sparkfun.com/spi_signal_names >>> https://www.eetimes.com/its-time-for-ieee-to-retire-master-slave/ >>> https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/ >>> https://cdm.link/2020/06/lets-dump-master-slave-terms/ >> https://blog.adafruit.com/2020/07/12/the-linux-kernel-has-now-adopted-inclusive-language/ >>> Jeff >>> ___ >>> Emc-developers mailing list >>> Emc-developers@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/emc-developers >> ___ >> Emc-developers mailing list >> Emc-developers@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/emc-developers > > ___ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
> On 30. Jul 2021, at 19:01, Michael Freudenreich wrote: > > I would rather like to see a new feature in software, like the variables > which provide machine coordinates as discussed in the other thread. That’s already in master. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
On Fri, 30 Jul 2021 at 00:27, Sebastian Kuzminsky wrote: > The buildbot and surrounding scripts will need minimal updates to > implement this change. A more diffuse concern are the various forum posts, tutorials, wiki pages etc which give instructions containing the branch name. (94 instances of "checkout master" on the forum, for example) -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
It's a good thing I don't have commit rights because I'd have a hard time not making a `tucker-carlson` branch just for kicks. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
I wish this much focus was being put into adding more features 😏 Thank you again for the addition of machine coordinates, Rene. I installed and tested that afternoon 🙂 Phil T. The Feral Engineer Check out my LinuxCNC tutorials, machine builds and other antics at www.youtube.com/c/theferalengineer Help support my channel efforts and coffee addiction: www.patreon.com/theferalengineer On Sat, Jul 31, 2021, 5:36 AM Alec Ari via Emc-developers < emc-developers@lists.sourceforge.net> wrote: > It's a good thing I don't have commit rights because I'd have a hard time > not making a `tucker-carlson` branch just for kicks. > > > ___ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers > ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Using `main` instead of `master` branch
On 31.07.21 11:35, Alec Ari via Emc-developers wrote: It's a good thing I don't have commit rights because I'd have a hard time not making a `tucker-carlson` branch just for kicks. I dont think anyone outside the US even knows who that is. Can we please keep local political issues past or present off this ML. ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers