From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by sourceware.org (Postfix) with ESMTPS id C5BEC3858D37 for ; Fri, 13 Jan 2023 14:44:50 +0000 (GMT) Authentication-Results: sourceware.org; dmarc=permerror header.from=cygwin.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=cygwin.com Received: from calimero.vinschen.de ([24.134.7.25]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MZCOl-1pBaBU1QCf-00V6YY for ; Fri, 13 Jan 2023 15:44:49 +0100 Received: by calimero.vinschen.de (Postfix, from userid 500) id D19AAA80795; Fri, 13 Jan 2023 15:44:48 +0100 (CET) Date: Fri, 13 Jan 2023 15:44:48 +0100 From: Corinna Vinschen To: cygwin@cygwin.com Subject: Re: newlib-cygwin.git repository: Switching "master" to "main" Message-ID: Reply-To: cygwin@cygwin.com Mail-Followup-To: cygwin@cygwin.com References: <32aca832-3e93-d988-7636-7d4853512610@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <32aca832-3e93-d988-7636-7d4853512610@gmx.com> X-Provags-ID: V03:K1:3BTggIy41lo1MAgFisEvwz8JeV1gilWwMw4WwZuFeOtPuIgLpz4 mlIZ8PiMgJuP0gaBjx0APsHa1xOly2EkHz1NoCUN1YRj+9iVGt4TBg3J2PRBqEmXVQhWGsI 0FYC6V+G4shkV67d4r8riW/vbdDRheVnyBfJ4CGMHxpARgm2qp4lEEBe8xgFOnHclDnGDT8 viBopF11deS++coX37H8A== UI-OutboundReport: notjunk:1;M01:P0:KO534FZc1R8=;7hw8XTK8yIZrWz2Ql5HYPfTzq4R ecV4exDDjTtnZJK3BUXSy0/LW7toc056cDBJwpsfFG7F67PuZj6MZn5ZDYsGf0Pu8R4r5CJp8 tGS1vYT64vPpvT6aY+28LcdzBwVCmZ4vKniK/ZFyU7A6IBTO3IPwiUUleCvbOWSsVEr1ay+YD 2xeFXsFSVmBgSAJ1CVbItvWRovV53Adc8gLeHZ/IXCBlOGFoXJC0D9h4fuCKCo9iVuA5i36lJ gQRMe2k52k5JtRWRqlMgUGQItcX02AYKPbXc26nFd9VTIl70wfybHBaEXYbbhqMm0z32Yz0KI XM6V7iJBrnyOHPpKHb4JPL0bwMwOVkgbMVKU5bhWVioW8ZST6d6EN108tUQFc74gbhN70VXZ3 qc/AYw8UNk4ZRh89izOrvHfoI6ztWgZOsljHfc+CdAje/92jIMC/qIJmmt6NCel2/xdOdIzoZ levq2U4mjUTb5jOio1fjsdpfddUuIxlrAKFtq4j2DDzUiZvTS9QctopDGhPut+gxhg4fVYHVx uslmK/CvKolkI1XfJr/WY8HLXCe4t6tTxdjf0n6sUxqXE43J1/+ImXCT2kolLhORiajqmcF2U +CUTfWiFovlBFUmWpENhdYc34TIp9c9ijpq7wGLwP8XQ6Gkpi8NutBfnCtfo8AwCSILsNImql RADUwnV/y6mVqbdyP6Mba7LCi74CHCVTzJFS9RdVWA== X-Spam-Status: No, score=-96.8 required=5.0 tests=BAYES_00,GOOD_FROM_CORINNA_CYGWIN,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_FAIL,SPF_HELO_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Jan 13 14:20, Sam Edge via Cygwin wrote: > On 13/01/2023 11:55, Corinna Vinschen via Cygwin wrote: > > Hey folks, > > > > In the light of recent discussions, and following other projects already > > having done this step, we changed the name of the "master" branch in > > the newlib-cygwin.git upstream repository to "main". > > > > If you fetched from upstream in the last two days, you might already > > have noticed that an "origin/main" branch suddenly showed up, but your > > "master" branch still worked as before. > > > > The reason is that we also added a symbolic reference upstream, so that > > "origin/master" points to "origin/main".  Both "branches" are now > > constantly kept in sync upstream. > > > > Therefore, you can continue your work on "master" without disruption, > > if you prefer to do so. > > > > However, on the client side, the "master" and "main" branches are > > treated as two distinct branches.  If you work on your local "main" > > clone and commit a patch, it's not keeping your local "master" branch in > > sync.  After pushing your change upstream, though, the upstream idea of > > "main" and "master" is, again, the same.  After fetching from upstream, > > the patch will show up in both tracking branches, "origin/main" as well > > as "origin/master", so pulling on both local branches will show the same > > tree. > > > > Having said that.  Ideally you only use one of the branches locally > > to avoid any confusion: > > > > - If you prefer to work in "master", just continue to do so and don't > >   create a local "main" branch tracking "origin/main". > > > > - If you prefer to work in "main", checkout "origin/main" as "main" and > >   delete your local "master" branch. > > > > > > Have fun, > > Corinna > > > > > > While I can understand sensitivity over the word 'slave' this is taking > things > too far in my opinion. I just conducted a quick poll of my Afro-Caribbean & > other non-Caucasian workmates who all express the same sentiment. > [...] > Well, it's a fait accompli on the Cygwin repos. That's why we chose the symbolic ref solution. You can use both in future, whichever you like more. Corinna