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 08:13:53 +0000 Message-ID: <7b7f5641fc0760aee730@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> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35076"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 09:14:36 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 1mh5z9-0008uB-NF for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 09:14:35 +0100 Original-Received: from localhost ([::1]:60344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh5z7-0000d9-P3 for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 04:14:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh5yY-0008PR-RG for emacs-devel@gnu.org; Sun, 31 Oct 2021 04:13:58 -0400 Original-Received: from heytings.org ([95.142.160.155]:46660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh5yW-0000kI-OV; Sun, 31 Oct 2021 04:13:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20210101; t=1635668033; bh=Koh7AQb/4l0Yn9tr5QO/+MvnuOwywQ+la/uQMtM7RF8=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=IcRWta6+tRoeOsEevwncb+c3nMSMm2ARg77J7faWtkvBryMLhXvwUWtmXWpMSJZy0 IPw23vxuh2TlN5oUEKxqnkBEmM/y8VBGrFWM9EWuo06OYZ0HmFVf8LYMDhUEiys5HX 1kGKbrbmqlVsF5iUHL9c+EZ+AY7amXkwCt6FhctxE41Hg5nLhgFbFgqf+5mNbAbU/6 2XnLFB8IJEyel1jlhl+wvEgQBIktSov75CakyFl5zlRPi42fbjSeYDQXcxlPKgjEnm h1wOm/7aJZyp3b2Yx2PhALsYwrEllfUMzzaDw4CJ2xjANf/CcjbyksYPQgHWoDFAO1 GZQ1i2F9E5I/A== In-Reply-To: <83ee81oe2n.fsf@gnu.org> 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:278302 Archived-At: >>> Btw, if this is what will make the situation better, we could merge ti >>> master immediately after pushing to the release branch, by the same >>> committer. >> >> This could be automated with a server-side hook, whose execution would >> depend on some tag in the commit message which would indicate whether >> the commit should or should not be merged into the trunk. > > The problematic part of merging is when there are conflict, and that > cannot be done by the server. If there are no conflicts, using > gitmerge.el is so simple it doesn't deserve any discussion. > It's simple, but IMO everything that can be automated should be automated. What I have in mind is this: if push is not on return if tag is missing raise an error and return if tag is "escape" do nothing (in case something must be done without running that server-hook script) and return if tag is "do not merge" do a git merge -s ours and return (this cannot fail) if tag is "merge" try a git merge ; if that fails (which as you said happens rarely), print a message to ask the committer to use gitmerge.el; return