From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 30 Oct 2021 15:32:30 +0300 Message-ID: <8335oipuap.fsf@gnu.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12056"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, larsi@gnus.org, stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 30 14:39:50 2021 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 1mgneH-0002t0-Cg for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 14:39:49 +0200 Original-Received: from localhost ([::1]:37628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgneG-0005lR-57 for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 08:39:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgnXR-00005c-J9 for emacs-devel@gnu.org; Sat, 30 Oct 2021 08:32:45 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:52094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgnXP-0008CJ-PQ; Sat, 30 Oct 2021 08:32:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=+1LpGao2nwJAokFuiu4rLzoHClpiYwL6TfVHLPa1hls=; b=ehCy8nJQz9L9 bQV6DojZ1555vqGVgPo7NGh2CnCosCQt4ZZJLnoAoYCq87QcjbEwWx2UsqTR1KxgTTb+2R1g5GdqN N6AnYuACsVW7khSRBPmYRTpnn0kn7VL+tl+61l1BOM069g90XBdkuFXaqjY2WzJzrHKAtSWIq4WnS grTX6Mz5zhRINc2ouuo1EGIEVwKCtJvtUlyfCHAV9KQ3CXyUkEAVwtQGFvfR+XbaLYIsGeOEQYtKG p+YkJB2hNx1J+8xSsG/prKsuN4ogD4KpXMzHzm4TfFbsNZDlEueAoT3HCd69nusZBjpPWMDK+zEa8 0XoY1vb2RzpGrufS0u3c/Q==; Original-Received: from [87.69.77.57] (port=4274 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgnXP-0000DA-7N; Sat, 30 Oct 2021 08:32:43 -0400 In-Reply-To: <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> (message from Dmitry Gutov on Sat, 30 Oct 2021 15:30:30 +0300) 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:278277 Archived-At: > Cc: rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca, > emacs-devel@gnu.org > From: Dmitry Gutov > Date: Sat, 30 Oct 2021 15:30:30 +0300 > > > And of course, cherry-picking doesn't remove merge conflicts, they > > will still need to be resolved. > > By the author of the change, that's the point. > > So I also think it might justify the additional overhead of having to > cherry-pick every change. Many authors don't have write access, though. > > We've been using the current workflow for years without any major > > problems. Changing that now radically doesn't make sense to me. It > > will most probably need several procedures to be modified that were > > stable for several releases, and I don't see the gains which would > > justify that. We have enough real work on our hands. So please let's > > not do that. > > Do we have a volunteer who will take over from Glenn? I hope we will; if not, then the usual suspect(s) will have to do it.