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: Sun, 31 Oct 2021 15:03:13 +0200 Message-ID: <835ytdny7i.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> <8335oipuap.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7491"; 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 Sun Oct 31 14:04:32 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 1mhAVj-0001kI-Te for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 14:04:32 +0100 Original-Received: from localhost ([::1]:53686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhAVi-0005sD-Dh for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 09:04:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhAUf-0005C9-RR for emacs-devel@gnu.org; Sun, 31 Oct 2021 09:03:25 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:52928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhAUf-0001Oy-7w; Sun, 31 Oct 2021 09:03:25 -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=84Y9zOCaLBtSEvzuRCID05e2LJ2ZacXJFOh7u988WIw=; b=S+yXe4bjpJFb DSpiRBL8epCdLLo0mR1cU5gRG0sRwRLYYkYUzhjoS6NLTAneAuhwEG3l72lyCnbFr6PJXKxuXbvI6 XTjUgBI+ywhQB9uNFlbxWdVTbEVry4HCVLPIj3bpP0vwbVI6gsMQw9X5a9nNZiZen+pVDKGWDPUx/ X3HOMPK+e1D0rhOJvJVGBcOyK9vWeLogubaOhG8OUeB177Tn6gQt+i6AjpWz/FhaiNKS3b4GC9KAJ rjiBk/Tv9SrBsdokeBTfWh31qNehv2R5D1d7Nf5hsT71f0sOo7gZmWMb1td59dqa2AmWjz+kXI8Fj PpfvJUuqntIhpkO8OWqMXw==; Original-Received: from [87.69.77.57] (port=3938 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 1mhAUc-0004d1-Td; Sun, 31 Oct 2021 09:03:23 -0400 In-Reply-To: (message from Dmitry Gutov on Sun, 31 Oct 2021 14:38:26 +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:278310 Archived-At: > Cc: larsi@gnus.org, rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca, > emacs-devel@gnu.org > From: Dmitry Gutov > Date: Sun, 31 Oct 2021 14:38:26 +0300 > > On 30.10.2021 15:32, Eli Zaretskii wrote: > >> 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. > > > > The responsibility with fall on those who install the change, to no > one's surprise. My point is that in those cases resolving merge conflicts won't be easier.