-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Mark,
On 6/26/20 10:48, Mark Thomas wrote: > Picking up this thread again I see a range of views. "main" seems > to be the most popular although several folks suggested "10.0.x" > and "use whatever GitHub use". There was also interest in "trunk". > Particularly with the additional suggestion of "10.0.x" appearing > in the middle of the discussion, I'm not sure where consensus lies > at the moment. > > One suggestion I particularly liked was to do the rename at the > point we branch 10.0.x and start on 10.1.x since we will need to be > updating CI and various things anyway. That is currently looking > like September as that is the target date for the Jakarta EE 9 > release. > > I suspect that this could get tricky as I'd prefer "main" or > "10.0.x", could work with "trunk" but really don't want to continue > with "master". I imagine others have similar views in different > combinations. Maybe if others express their views in a similar way > to the above we'll end up with a natural consensus. If not, we'll > have to figure something out. I understand the motivation to use more inclusive language, but IMO in the absence of the word "slave", this "master" branch is more analogous to a "master copy" of an artifact (usually recording) and reflects the true etymology of the term, here. If it's more convenient to make this change in September, then let's wait until then. Changing twice doesn't really help anybody and causes a certain amount of chaos. - -chris > On 19/06/2020 16:32, Emmanuel Bourg wrote: >> Le 16/06/2020 à 10:02, Mark Thomas a écrit : >> >>> Thoughts? >> >> I'd prefer the status-quo and keep "master", I've always >> understood this as the 'master record' (I know it might be >> historically wrong) and I haven't seen evidences it has ever >> offended or deterred anyone from contributing. >> >> If there is a consensus to change I suggest waiting to see what >> GitHub plans to do. The "master" name is a de-facto standard for >> Git repositories, and I think we should remain consistent with >> the new name that will be popularized by GitHub. >> >> That said, I have a preference for "main". >> >> Emmanuel Bourg >> >> --------------------------------------------------------------------- >> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl72WbcACgkQHPApP6U8 pFgzxQ//ZyTsETf5CjZ9S2CQ65GbSVY+FdhWB1Tuy6qrdmZgkII48PQWsu7SeFJL yCH0LM9DdMEmjBx9uoHWmFtOSxgPgAPGzqQYRsDcB2zwGpkyN/kHwFDVxRyBSy7Q NmRbE6K0orMalD86XjvFQlv/ClyOe4rNSbqywT8nw0zJFwiM2HVLJXV1CgvEor1k Z7uVd6f10mm/F4jxQxW2nQ0rvyiMaEEOKtnZG/nGL9kb5iLz/10LlFot1Wzg49Hf tbAbnH6k34u0OXkteYhbVNklhlGGMDKmbYCPUV+LJGZLl+pRb+Y6U1UDM22W+GCZ HnFYMPExDPj9QSd4C3sBWx8X7oT9fyf56puK0BqP3SQhAbKUp752f7y7bdLxoQq7 aQgZm3kvNH3Vk7tkSLtnroLGuZ7yelbZXtMqvLCgoX98JaoxqejUuSB7uL9zFZ/n Cu19NPxgRMSIyvrwredHhm2lDl0IBDeac/MeMwVplwb1VqLEZvrTdqwhg+Xe7NXo 2TilY/pLZhwnA/clyxwOo1wT+w/11s1tCMzZObSU5bVH1vbJH8Y6qVxot644Z303 QE5lPJprS6t/zIN3WVi6oSTcAo64fTdjIvlIUZ5oKakmclRvF0I2sWDt7d5m5CEI sdt7HBbH/gAZ1h96096Qp5PmyABFnaF1OmAkorKG94mAkQvQSO4= =l8h0 -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org