From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sun, 31 Oct 2021 14:38:26 +0300 Message-ID: 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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26334"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 Cc: rgm@gnu.org, larsi@gnus.org, stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 12:41:01 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 1mh9Cv-0006d5-AU for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 12:41:01 +0100 Original-Received: from localhost ([::1]:53770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh9Ct-0005AT-NZ for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 07:40:59 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh9Ac-0004QO-IE for emacs-devel@gnu.org; Sun, 31 Oct 2021 07:38:42 -0400 Original-Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:33281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mh9AY-0001ii-VZ; Sun, 31 Oct 2021 07:38:38 -0400 Original-Received: by mail-lf1-x136.google.com with SMTP id bu18so13633052lfb.0; Sun, 31 Oct 2021 04:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ewIZP6wjo4KTFRN8RHJL3P2CUyiXt4PjZk6tJ+/eSLs=; b=AczQgv9sjKlwqmjGLJFiTED+239zDwyxobzqcYYPB9/dDw1WJ9HpHQ6a45sTdEkTL8 91ONyMMUAjoN91GlNvvIqcSgO4Ih6fgSjuR3DJNsJlOeTQbn0YMz0ylYcuGHQVzRb2l4 BLDXNClqVUldU7hcSpSNXKnCBWiPE7liHQYCA0NgEP4uIkwC48wUKZCwA7s3U3jqVpKH /uzKU/Vip+d638035CLEJBMVbWKfpNmA7F0gskiIwLFr8PO9l61RLelILcbi2/89++G/ Lyq5h/Kj+l5AFn4bVnLJLdMwsvzOgTkHHncJUokNVvzFrsVjA8zs3z3UkY4AW82Yygtn IMbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ewIZP6wjo4KTFRN8RHJL3P2CUyiXt4PjZk6tJ+/eSLs=; b=ASfXOTNpKBSk8J9AjuU+t2J7s3gkcqaQRvMcL+tXHU1QGUTYmo1bblzagES7R0iMQu alaUBQtSzhA8X6g9b6lWCApiU2TI5MIRt2pUGrGMOvegRZa7uu9NrS/rXpplouePH4Kp xhhuEYHQl+VTW8ZjDj9t88JI41VablgQQ5O9/BSZGorAiG5zAp84Lef+VFmJ7C8kcExs CvmUlFgtTg0M66F5UjEFiAn7RnCMCa8F1KpEYoLUFyvfKXejOhYOdcD/cuEUMBhIz51y UKkunwVd886xqdxqK5Fjp2bBQHIrzTdHG8O4Tr5O8sjbM0kqTnudyByKfxfvIuOfyRjC /t9A== X-Gm-Message-State: AOAM530IwZqZi3cl8ipGTvWL1ohHRzsazZ6lxEOqW0ylIgOadAeXLuoI 8Kar0RGp9JfF/FlfJ1dSb5CZPOAhZoo= X-Google-Smtp-Source: ABdhPJxT3eGobwn9gJW6Zp7FqzxYKxiY9TcC98x4cgmjR7kaomcgpFNa2ZzenpYBSmg7CA0yWEceHQ== X-Received: by 2002:ac2:5dea:: with SMTP id z10mr11247211lfq.367.1635680308048; Sun, 31 Oct 2021 04:38:28 -0700 (PDT) Original-Received: from [192.168.0.103] ([5.18.248.29]) by smtp.googlemail.com with ESMTPSA id d39sm1140734lfv.73.2021.10.31.04.38.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Oct 2021 04:38:27 -0700 (PDT) In-Reply-To: <8335oipuap.fsf@gnu.org> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=raaahh@gmail.com; helo=mail-lf1-x136.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, NICE_REPLY_A=-0.592, RCVD_IN_DNSWL_NONE=-0.0001, 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:278307 Archived-At: 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.