From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sun, 31 Oct 2021 12:58:15 +0000 Message-ID: <7b7f5641fcb6eafc2caa@heytings.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> <83lf2ao4jz.fsf@gnu.org> <04203f394658f284d78b@heytings.org> <83ee81oe2n.fsf@gnu.org> <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24355"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, monnier@iro.umontreal.ca, Eli Zaretskii , larsi@gnus.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 13:59:38 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 1mhAR0-00069s-Ir for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 13:59:38 +0100 Original-Received: from localhost ([::1]:50272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhAQy-0003Na-Mt for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 08:59:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhAPm-0002fh-K7 for emacs-devel@gnu.org; Sun, 31 Oct 2021 08:58:22 -0400 Original-Received: from heytings.org ([95.142.160.155]:46896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhAPk-0006M7-HD; Sun, 31 Oct 2021 08:58:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20210101; t=1635685096; bh=Wa5f+89WuwtIBDHn7KeS9Tjj6PzJS1lBjo6rERPzOlQ=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=Q+Kkd32dR2JPISI+CtqYR0RlgdrpQxPkVy8EBrOLOtJS2CJs0gT5rYuebUaYtc0TJ FCGReKow57rq+MpuCOWmfOq1DPzPhKilAr4Ez3F3P4/TPx7eWxvpA8PBziJyeeR892 ySTibpFgLGA5Bx/7oPMz7QncwOzn5nnc4F+GdlegkM2XNb24w3PsljFrhCWO1/ZdwH sDnU3TL7sI+lYiL9C6B0b7GlLv1Cc4asflJyyHn+kqhg59fXslh737Xto9kWlUeDsb h6hzbzJ/OIra91TbjwTMN4yuRzSyJ61Fs6Yy3woR3vNZLnRH+IwAP76dssHPtkNXw1 +sLCj1Gy/q1QA== In-Reply-To: <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.org 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_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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:278309 Archived-At: > > 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.