<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<p>+1</p>
<p>Git uses `master` branch in quite a few places in its docs and
`git init` produces a
`master` branch. ideally, a change to git should drive all of this
- that way there would be no confusion.<br>
</p>
-Petr<br>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">On 6/19/20 10:45 AM, Keane, Erich via
llvm-dev wrote:<br>
</div>
<blockquote type="cite"
cite="mid:DM6PR11MB4427A3C076FE383AA0A32BF6F0980@DM6PR11MB4427.namprd11.prod.outlook.com">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="Generator" content="Microsoft Word 15 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0in;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:Consolas;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoNormal">I agree with this. As much as I dislike
the name that I believe github will choose, we should just do
whatever everyone else is doing.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Note that in addition to the github
discussion, there is some extensive discussion on the .git
mailing list (IIRC) about choosing a new name as well. I hope
github waits until that choses a name as well.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1
1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> llvm-dev
<a class="moz-txt-link-rfc2396E" href="mailto:llvm-dev-bounces@lists.llvm.org"><llvm-dev-bounces@lists.llvm.org></a> <b>On Behalf Of
</b>Philip Reames via llvm-dev<br>
<b>Sent:</b> Friday, June 19, 2020 10:39 AM<br>
<b>To:</b> Mehdi AMINI <a class="moz-txt-link-rfc2396E" href="mailto:joker.eph@gmail.com"><joker.eph@gmail.com></a>;
llvm-dev <a class="moz-txt-link-rfc2396E" href="mailto:llvm-dev@lists.llvm.org"><llvm-dev@lists.llvm.org></a><br>
<b>Subject:</b> Re: [llvm-dev] Inclusive language in LLVM:
can we rename `master` branch?<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p>+1 to the notion of changing the branch name in general.<o:p></o:p></p>
<p>However, I think there's a practical aspect which needs
considered. Currently, "master" is the defacto convention
used across many, many projects. There's currently a lot of
conversation going on across many projects about naming. I
think it's really important that rather than just picking
something that we wait and see what the new convention is, and
adopt that. I've seen reporting that GitHub is considering
changing the default name for new projects. If that does end
up happening - I hope it does - I think we should use whatever
name they pick. Convention is critical for ease of use of new
contributors.<o:p></o:p></p>
<p>Philip<o:p></o:p></p>
<p>p.s. There's a bunch of other terminology in use which is
potentially problematic, but I'm intentionally restricting my
response to this one. I think each deserves discussion on
it's own merits.
<o:p></o:p></p>
<div>
<p class="MsoNormal">On 6/19/20 2:48 AM, Mehdi AMINI via
llvm-dev wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<div>
<div>
<p class="MsoNormal">Hi,<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">When we moved to GitHub a few
months ago, we used without more consideration the
"master" convention to name our development branch.
On SVN it used to be just "trunk".<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">This naming is <a
href="https://tools.ietf.org/id/draft-knodel-terminology-00.html#rfc.section.1.1"
moz-do-not-send="true">
unfortunate</a> as it can <a
href="https://dev.to/afrodevgirl/replacing-master-with-main-in-github-2fjf"
moz-do-not-send="true">
hurt some contributors</a>, and there is really no
technical advantage that I know of to favor this
convention over another.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">I am perfectly aware that
`master` has other significations than the
master/slave meaning, and I personally never made
this association in the past. However I'm also able
to recognize that I'm privileged here, and that not
everyone is in the same position.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">As we intend to be an inclusive
community, I propose that we change the name of our
development branch and that we adopt instead a more
neutral terminology for the LLVM monorepo. Possible
names are "dev", "trunk", "main", "default", ...<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">We need to plan a transition as
all the bots will need to be updated to track this
new branch instead, but these are minor technical
details, nothing compared to the SVN->Git
migration we went through.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Since I'm on this topic, we
should also likely look into the pervasive use of
whitelist/blacklist in the project.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Thoughts?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">-- <o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Mehdi<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><br>
<br>
<o:p></o:p></p>
<pre>_______________________________________________<o:p></o:p></pre>
<pre>LLVM Developers mailing list<o:p></o:p></pre>
<pre><a href="mailto:llvm-dev@lists.llvm.org" moz-do-not-send="true">llvm-dev@lists.llvm.org</a><o:p></o:p></pre>
<pre><a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" moz-do-not-send="true">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><o:p></o:p></pre>
</blockquote>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<pre class="moz-quote-pre" wrap="">_______________________________________________
LLVM Developers mailing list
<a class="moz-txt-link-abbreviated" href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>
<a class="moz-txt-link-freetext" href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a>
</pre>
</blockquote>
</body>
</html>