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: Sat, 06 Nov 2021 11:28:43 +0200 Message-ID: <83o86xbpkk.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30263"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 06 10:29:35 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 1mjI11-0007fj-7Z for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 10:29:35 +0100 Original-Received: from localhost ([::1]:56720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjI0z-00066M-C4 for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 05:29:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjI0S-0005NA-2T for emacs-devel@gnu.org; Sat, 06 Nov 2021 05:29:00 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:39084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjI0R-0001nm-Ov for emacs-devel@gnu.org; Sat, 06 Nov 2021 05:28: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=H+EXSXgfhFV0dNMOkQFD/MuAvVfqNPeAO0pVUN0ywj4=; b=nPbiRk3dGZgP CJjFSZO/sDW7xYe3qgXjJ26YjgFBzPB6ibSjmICN/QvPOgkN216fL88Q4pF1UuRj6BFoyt4KCwY42 bY9cGn9SUaxAziIvTKfz2sGeTL3ilcDacVr0/0y+wyPmJbmPP0JW4IsymhkhKHo2uWyJaV39kMaaY RtD4FIVl2qaSX+8sRdQ035MkJJy4cCJHqeafiOtlzydQ6lMw/1za+9/B4Pd78A1G0qCqghDZ1N+vD G9yHlhtADYSTd08EE6aId5kbXDrGHvgnZsw+OdoHAnRSCHz5xTR4+4p1mVbxDBB05ZlBfDnozJP7U cUZBqfuvF1Umj6SzY8xgOQ==; Original-Received: from [87.69.77.57] (port=3803 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 1mjI0R-0000jU-1t; Sat, 06 Nov 2021 05:28:59 -0400 In-Reply-To: (message from Glenn Morris on Fri, 29 Oct 2021 12:35:22 -0400) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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:278852 Archived-At: > From: Glenn Morris > Date: Fri, 29 Oct 2021 12:35:22 -0400 > > > I've had enough of merging the release branch to master, > so someone else will have to do it from now on. > > I use admin/automerge from cron with a wrapper that: > 1) first checks the release branch passed make check > 2) passes "-n 1" if the last merge was more than 1 week ago What's the procedure with merging commits that change etc/NEWS on the release branch? gitmerge.el insists on trying to merge those in etc/NEWS for the next release, which is not TRT. One could skip the commits which change only etc/NEWS and then "merge" manually by copying branch/etc/NEWS into trunk/etc/NEWS.28, but isn't there a better way? And why doesn't gitmerge.el do that automatically?