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 00:59:06 +0300 Message-ID: <80e43df3-16d3-0e7c-1b70-89cd9ea27267@yandex.ru> 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> <7b7f5641fcb6eafc2caa@heytings.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4953"; 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, monnier@iro.umontreal.ca, Eli Zaretskii , larsi@gnus.org To: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 22:59:44 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 1mhIrg-0001A9-4C for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 22:59:44 +0100 Original-Received: from localhost ([::1]:51738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhIre-0004EJ-QM for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 17:59:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhIrA-0003Yk-Vv for emacs-devel@gnu.org; Sun, 31 Oct 2021 17:59:13 -0400 Original-Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]:42548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhIr9-0001TF-5i; Sun, 31 Oct 2021 17:59:12 -0400 Original-Received: by mail-lj1-x22e.google.com with SMTP id 205so26350690ljf.9; Sun, 31 Oct 2021 14:59:09 -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=6E6oWMoDYxVo86X2/Ba3FICQ0/VUla42foMLYDFPr4o=; b=dJdNQkjmiJ9pJSPBRvWCOeRhJKk8m4JJCjubfNA7RzsCVf1xWTDGeH2v8ab6wyLrhg VH2IOPMrArN1itS4LK7qAm5xxhglMAKRosKFCHKBckut040Rf+Cvmd5MRxRNUnM+YQh7 W0heSsn0d+bxd6ONZL+Mup11JrAZpwIhe+kTAGG7sQm22awJJloNoW88CsgvJW9Ny0Ov dsTLkUTB5proVFNEaJPl4cKKyL7w79M5qAtasmD4UyOzW9w4TmYd8T6WdKgzoG+4+mVG TeUMHdx4C8GYcGU4rGSMqD+QNW661zzPS8XBosVKKt5GaMeC8ru2dKohKU4YXd7tOsCu 7bVA== 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=6E6oWMoDYxVo86X2/Ba3FICQ0/VUla42foMLYDFPr4o=; b=12KM/LK8tw/TL4wTl/raPRI1RI9800F9lt4L7o0S0ymce5C546TexjfPGgNX/4X0BT rop683fF/guY+bTNPc17GMc4Tu7/nYG4jYraQqkkXJjE3/O5A3jsTx1p6CdAYIGEKjgH Ds3Z3TsT/aaaxzX4Nh53MFd8v4GU0duhYoYZGQ1aV+wLjxXwHJNuurFScLGwBQgHnr6W KjB1LBZLZAQNxRxMlbEonxffvx/zWXZEHI8QI/i1lVCZXXdVIti9i+zfqRTX0wh6k3rR cwF/gg7nsUz3ZFFebZEA+5JORz6TLZQ/yqpcHsI0hGCCdcLTyRxgfo0owOGwkWkR43sX 39sQ== X-Gm-Message-State: AOAM532UPvtF09P9y5whE/eRoyLhPWfbdTFKDQtGvNbLNJn9+sdnyV+k 5gKw7WR756Q1Nrgc1YBipnDhl/GNe2o= X-Google-Smtp-Source: ABdhPJxbRLgjLu5mwTR+PG4MjS1LCCpYLVfCRfZXHwP4yzP1HEiE9JErr7J9k6QPPfxkn/rF9/Vd+A== X-Received: by 2002:a2e:a4d9:: with SMTP id p25mr26230373ljm.427.1635717548445; Sun, 31 Oct 2021 14:59:08 -0700 (PDT) Original-Received: from [192.168.0.103] ([5.18.158.28]) by smtp.googlemail.com with ESMTPSA id s17sm1404144lfe.10.2021.10.31.14.59.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 31 Oct 2021 14:59:07 -0700 (PDT) In-Reply-To: <7b7f5641fcb6eafc2caa@heytings.org> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=raaahh@gmail.com; helo=mail-lj1-x22e.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:278343 Archived-At: On 31.10.2021 15:58, Gregory Heytings wrote: > >> >> A server-side check could be used to do the check "lazily" and only do >> one merge commit per day (or week, etc), rather than filling the >> master history with merge commits (where their ration to "real" >> commits could be approaching 100% if we ask everyone to merge right >> away). >> > > And why would that be a problem?  It's a commit to two branches, one > branch has a merge commit for each commit on the other branch. More merge commits = more complex history = more effort one has to spent (sometimes) when reading it (busier 'git log --graph'). It's not a grave problem, but best to be avoided when we can.