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 09:20:32 +0200 Message-ID: <83ee81oe2n.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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="796"; 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: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 08:21:40 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 1mh59w-000AdT-FD for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 08:21:40 +0100 Original-Received: from localhost ([::1]:51608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh59v-0000d3-DB for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 03:21:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh592-0008Lt-9a for emacs-devel@gnu.org; Sun, 31 Oct 2021 03:20:44 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:45474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh591-0003W3-ER; Sun, 31 Oct 2021 03:20:43 -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=1Nu/auWirIMVC3mmc9tgw0FFVjZ14ke22lKcLve5BGM=; b=oR3ZkKKSh135 2IpCuMP4IkMpIBqCB/86T2qI0qDaAFNsxLtwm1eeYBuVy92L1gMtN4Pe9hyzcWrxGEpYV7PMEXfOX 8HlyOM7xeQ8rjkBcaJfc6RrRMayRqay+mBPvrYWlsW6r6gDeRyJfGkN3D5Pt5skq4Z5SdlRd0cnGv KqnNmR6ZrH9uyo+CRy5oWk0tdljfRxmMKlBeK4khJhnz0BhLmlLcMPpQsPF5ifjmJIStvy68Xnhvs SbxoXzUxH3hy9TNSN3pFAJNANdrkwhDc8Z0BZOyG5RJPeL+qgYzGXO3B9IDTeUk+PVMCDXYW5CrHH k3HX16V5x3fRx0o8ar3DTg==; Original-Received: from [87.69.77.57] (port=2033 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 1mh590-0004oF-NV; Sun, 31 Oct 2021 03:20:43 -0400 In-Reply-To: <04203f394658f284d78b@heytings.org> (message from Gregory Heytings on Sat, 30 Oct 2021 23:14:00 +0000) 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:278301 Archived-At: > Date: Sat, 30 Oct 2021 23:14:00 +0000 > From: Gregory Heytings > cc: Dmitry Gutov , rgm@gnu.org, larsi@gnus.org, > stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org > > > 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.