From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: elpa.git and `new-master` Date: Wed, 16 Dec 2020 22:41:24 +0200 Organization: LINKOV.NET Message-ID: <87y2hxmtcr.fsf@mail.linkov.net> References: <20201216064753.iy5hw63luyi5md6p@E15-2016.optimum.net> <87mtyenmve.fsf@gnus.org> <85688208-f1f5-0126-6d8a-0e75eb6bb065@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31648"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: Lars Ingebrigtsen , Emacs-Devel List , Boruch Baum , Dmitry Gutov To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Dec 16 22:06:19 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kpe02-00087m-Ju for ged-emacs-devel@m.gmane-mx.org; Wed, 16 Dec 2020 22:06:18 +0100 Original-Received: from localhost ([::1]:57562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpe01-0001wW-M6 for ged-emacs-devel@m.gmane-mx.org; Wed, 16 Dec 2020 16:06:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpdys-00015b-3m for emacs-devel@gnu.org; Wed, 16 Dec 2020 16:05:06 -0500 Original-Received: from relay11.mail.gandi.net ([217.70.178.231]:39015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpdyp-0006K2-TD for emacs-devel@gnu.org; Wed, 16 Dec 2020 16:05:05 -0500 Original-Received: from mail.gandi.net (m91-129-99-98.cust.tele2.ee [91.129.99.98]) (Authenticated sender: juri@linkov.net) by relay11.mail.gandi.net (Postfix) with ESMTPSA id AD566100004; Wed, 16 Dec 2020 21:04:56 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Wed, 16 Dec 2020 13:24:35 -0500") Received-SPF: pass client-ip=217.70.178.231; envelope-from=juri@linkov.net; helo=relay11.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:261063 Archived-At: > I don't have a strong opinion on the specific color of this bikeshed > ("master" is convenient because it's less work to implement, "trunk" is > what I got used to back in Bzr days and what I thus keep using locally, > but "main" is more meaningful (and "virtue signaling")). > > My original plan was to rename `new-master` to `master`, but I'd be > happy to rename it to `main` instead. For the sake of completion, either `master` or `main` is fine, but please don't add both branches with the same prefix. For example, I use completion on branch names all the time, and it's very convenient to quickly type just `o TAB m TAB` or `o/m TAB` to complete the `origin/master` branch. Having two branches with the same prefix `ma-` would be a hassle.