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: Mon, 1 Nov 2021 01:00:48 +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> <83lf2ao4jz.fsf@gnu.org> <04203f394658f284d78b@heytings.org> <83ee81oe2n.fsf@gnu.org> <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> <87zgqpntfm.fsf@gnus.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="15903"; 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, stefan@marxist.se, emacs-devel@gnu.org, Gregory Heytings , monnier@iro.umontreal.ca, Eli Zaretskii To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 23:02:12 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 1mhIu3-0003ub-7e for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 23:02:11 +0100 Original-Received: from localhost ([::1]:53740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhIu1-0005i6-Ac for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 18:02:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhIsn-00051V-SB for emacs-devel@gnu.org; Sun, 31 Oct 2021 18:00:53 -0400 Original-Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]:45040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhIsm-0001tP-1s; Sun, 31 Oct 2021 18:00:53 -0400 Original-Received: by mail-lj1-x22b.google.com with SMTP id x19so2260723ljm.11; Sun, 31 Oct 2021 15:00:50 -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=E3NyuzIhfIs+W7ZllWdGEAnfq0HeF/XiiS5470JqGuk=; b=Jq/CtO+duPvxq0sAqbl8QCF50RQm4XEnCcNkbaSv/O1r0EQYr9XDyMxlbU4/xSd5pA JsOPAGWd1R2NtRDVhxNJ4nE5AcddltukheDzG3EASQgQNFFr3GyyZDeHDJZz37Al24x6 Mx4BZCKRAFhAbWBx4N67kMj4Kv9h7zYT80JJeHO93SVpWgJHitpKTE+W9TqAGlA5u9Zw 79cFjG47kQ7uypDDvHuaji/Om+K57QrODgcXSVn0vZBZVdEouQHJsdIr3AU8fQb4FAGt N7hf4zi9WZyCbbTgHea0BTb6AGEYWf5Wfj/ZRVct/vAP/L40jK3YnXGh1bAf6DVXRRPu 6Y8Q== 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=E3NyuzIhfIs+W7ZllWdGEAnfq0HeF/XiiS5470JqGuk=; b=41GvB8DxH2TLu9Gp6xrAQ/VDBTjp2oPjWuE+XpD/WV/WRkKiXaBk4aiWGbnd9bmFh6 Hj4dSuXvAzZlvYZkdl3fiz7ZvF2Un/SVIYFsVuOxM2J1GUmnVZYhUgd+lIg7dGzbmSDw KCkE3vzwEuB4XcA8P1HeFifDI+KNCjh7tsnrWc9pIs2WMVmzh9VfeNwB5Qfw7rTUjM/3 3rAkoFxq+nvUOVQgaNAmLmoubTq8jmZnAT+ggi3/6+DVtf9fxetNGa4eS8igDRimXzWV NqRfCXURoeM04tPDHmKdaQlJVnesF6TByygh0bBqfI5oI8VcaYQ3ec0ND7uYwD5wngpR 93Jw== X-Gm-Message-State: AOAM531jNJIXx5wUVdgV8xhQn4C/misKinlPxph87c30u18yJpAr9q6J 9s/IKrMOH/xf3jFJK/jSv9u/v9woAvA= X-Google-Smtp-Source: ABdhPJxtDfXFRvNByTIttwQTXv8vpsp4hmKiVJdhheDJfgEWeGeslnN4L3pbpeh2EYoJE81NHmf7ag== X-Received: by 2002:a2e:b0f5:: with SMTP id h21mr24851933ljl.215.1635717649687; Sun, 31 Oct 2021 15:00:49 -0700 (PDT) Original-Received: from [192.168.0.103] ([5.18.158.28]) by smtp.googlemail.com with ESMTPSA id f25sm560116ljc.128.2021.10.31.15.00.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Oct 2021 15:00:49 -0700 (PDT) In-Reply-To: <87zgqpntfm.fsf@gnus.org> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::22b; envelope-from=raaahh@gmail.com; helo=mail-lj1-x22b.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.29 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:278344 Archived-At: On 31.10.2021 17:46, Lars Ingebrigtsen wrote: > This reminds me -- another advantage to the cherry-picking approach is > that the "master" VC history remains clean and easy to understand, while > doing all these merges makes it full of noise. Good point, actually. While cherry-picking is an inherently "dirty" activity, neither the release branch nor the master branch will carry duplicate commits, so they aren't carried over to the future version.