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 17:12:48 +0200 Message-ID: <83wnltmdn3.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> <83lf2ao4jz.fsf@gnu.org> <04203f394658f284d78b@heytings.org> <83ee81oe2n.fsf@gnu.org> <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> <87zgqpntfm.fsf@gnus.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36724"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, gregory@heytings.org, monnier@iro.umontreal.ca, dgutov@yandex.ru To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 16:13:57 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 1mhCWy-0009Im-Gg for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 16:13:56 +0100 Original-Received: from localhost ([::1]:59350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhCWw-00024T-D0 for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 11:13:54 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhCW3-0001Oa-Pa for emacs-devel@gnu.org; Sun, 31 Oct 2021 11:12:59 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:56312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhCW3-0002uw-8W; Sun, 31 Oct 2021 11:12:59 -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=8dHBPFzjND+TjzhBDQKGl1xZi6c3HYDNhocVzUCLBA4=; b=P18WMghBWAZ9 ed+N9XckKtxf68jWvUua3H6jIpE60qGocnBp4fhtbLPhGfIkECCZcWNSRMHhpiR53smXn6n9+QhLW SyY37Knv8J7jd0kDaJphvWTGHgf73LjlQSqCQa17XJhFZsouaPgjSweai69F+uZnfFRY1xhQzKf4a eeZE3yLJQ83zJZsw0YmlPkyIcQlupJH9uviDY7THb13K7kMZAoNdPpiiMLkgI6idf+qKQVJgLmLDn nbeacA6sXhqeDKAgIvHSq10TToshIIoMCfkNGHtg6GB5g2yZpTrN8aNPeFe6ld4TzfwQiG+wpFYrW tEi08Dtibvocae4kCx3haA==; Original-Received: from [87.69.77.57] (port=3976 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 1mhCW2-0008OT-Ez; Sun, 31 Oct 2021 11:12:58 -0400 In-Reply-To: <87zgqpntfm.fsf@gnus.org> (message from Lars Ingebrigtsen on Sun, 31 Oct 2021 15:46:21 +0100) 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:278313 Archived-At: > From: Lars Ingebrigtsen > Date: Sun, 31 Oct 2021 15:46:21 +0100 > Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, > Gregory Heytings , monnier@iro.umontreal.ca, > Eli Zaretskii > > Dmitry Gutov writes: > > > 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). > > 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. We've discussed this long ago and decided we didn't care. The master history cannot be clean anyway, because when there's a race between two committers pushing at the same time, one of them will look like a merge from a branch.