From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sun, 31 Oct 2021 15:46:21 +0100 Message-ID: <87zgqpntfm.fsf@gnus.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 Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37042"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, Gregory Heytings , monnier@iro.umontreal.ca, Eli Zaretskii To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 15:47:51 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 1mhC7i-0009TU-KV for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 15:47:50 +0100 Original-Received: from localhost ([::1]:45692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhC7h-00008D-2L for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 10:47:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhC6m-0007td-5E for emacs-devel@gnu.org; Sun, 31 Oct 2021 10:46:52 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:57170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhC6k-0007Gg-A7; Sun, 31 Oct 2021 10:46:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dFSZSEAW+2rrTE3N8Zw0HH7y8XvW2H+bWfjlPcty5tg=; b=ge3Fbvw4LOcWN8iz/Rmz0SjnQr sTUHa5Q1wKF+sDdfPYB9tdDTdeE2PDvs/SBjIgLs19GUicR/tWp1uLHpS4T+dMx+rRDGPPH2ualCR g2X1dNf5B9TNc2FsojOWYQ+n/b1GIea99Det9V094QTrx1PZSVuFVcSAco4yPqQOGdBQ=; Original-Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mhC6H-00043n-Lu; Sun, 31 Oct 2021 15:46:24 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAFVBMVEU8Y0FJhztjl1Jo mlKDqW6mwZH///+tjQ/pAAAAAWJLR0QGYWa4fQAAAAd0SU1FB+UKHw4lKvFBS8IAAAGiSURBVDjL dZTrccQwCITlTAowuIETbiABdyBXkP6LyS6SH7m7KD/Osx+wgDQp5TwiukYVETOrlzxRiTATq3oB ymIOQPUClEUDx0WZ9LjiEeYrgKnqCSQBdZpUnQdIA1SgR5gD6ONMQKFlZJjKBSoTDgD01UHVKqad wAPfj26hHEJTd0d6TfOJBlxDejsyFhcAyV1oPZqytXz+sNDcp2ZldwvMZ4ubH+vgGixWFrKFQalr OkQuhM1xhR9FZraBffhq6MloZueeOJ2hMqNxKd/o9bBAee9TA/jIQF3cBa8vKsffDqAjkJeRv2iv ZgYuu+s04Wbon+PVcIahrwTgkYATZ8qa/lvgL0v5sUEOohZ726J35ZRpUtnUvu+RgKvt+pBbEOCe 2MiWOSiytw4wCaoiMCKjs85GMOEp760hKtUW3a4Iy7DOCM7TAMbn6OU8HWwZvt30sARtdHJLUIKt 7fF0XEpavZwqJd6e/8D6b4a8B3h+74FXmctLKB/TEzCZ8c5mXlG5AG5PIOaLmvh716U8gy6/gHzL fwA/jP8+VOUGYF/KLwhdnHdfNotSAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTEwLTMxVDE0OjM3 OjQyKzAwOjAwtnwaKgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0xMC0zMVQxNDozNzo0MiswMDow MMchopYAAAAASUVORK5CYII= X-Now-Playing: Oval's _94diskont_: "Do While" In-Reply-To: <9b18f0c1-0dc0-9c88-a6e1-df3aa5d4a94b@yandex.ru> (Dmitry Gutov's message of "Sun, 31 Oct 2021 14:40:29 +0300") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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:278311 Archived-At: 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. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no