From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 6 Nov 2021 03:53:07 -0700 Message-ID: References: <83o86xbpkk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11124"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii , Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 06 11:53:50 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 1mjJKW-0002mj-VI for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 11:53:48 +0100 Original-Received: from localhost ([::1]:60524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjJKV-0006Wi-HH for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 06:53:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjJK0-0005qp-GF for emacs-devel@gnu.org; Sat, 06 Nov 2021 06:53:16 -0400 Original-Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:33547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjJJu-00020M-5z; Sat, 06 Nov 2021 06:53:16 -0400 Original-Received: by mail-pg1-x536.google.com with SMTP id r28so10574104pga.0; Sat, 06 Nov 2021 03:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:in-reply-to:references:mime-version:date:message-id:subject:to :cc; bh=WywUtHMdSKuwnFXPBKbjk+ZIdlXNmvvTTa/mZv8rCNw=; b=flVmYv9uS18ili2dMlBt5Yr79RvrXr3wDoIessMSYadvuFYV7iIvd39P/RJ5eZxE/F I7qWnkNtRFLh1N3Q6slSoCTUZZz12MD8oFQJDF2a9Lfzzv1orGXjX5aiMTyiU+P4igQ7 2rTBELRbxG5zbJJA2Bj0txNls7cnE/rSH1cH/V4mjN7aAGNu0LqXCXsW32leJzP4ADFH seUHQQlQH/VCgN1Jag0uVXrRBFBE1eWp8r+rSUS/dXLBVjdD/EYnug6udLR84DkjLKTT DHf0nJXemb6tYIaq8M9W6umBUWJayNf0LlMhJBTlpe+OkSeSA4rir143PHdpsg9sWjb+ autQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=WywUtHMdSKuwnFXPBKbjk+ZIdlXNmvvTTa/mZv8rCNw=; b=OG9z/3deFB7cHPMu9cAz/hngQkmL3k8piI384J6zn4HbFuTDGz0nOrBHrvSa9zABfG xYOeasd4SW6qAYudbeGUry7N3CXIk58sJXrO31faANu9lprMiDx/UyfMn+DDLLsWxvp+ WJ4snTP86TMJJvHJXWF5IHVT+lTKkkr1SXAODO4Uqdvy0NmX8DF89cvi/Lft/GcHhPh3 vXVGI+yfjlWWJ2qZQ7FfXxTvyJewxgYkHg4f0M0gLSerjoBH4RHJdQtMFJcGVA49BPeU QVv7DGbI9LysUvdC58XtIrTp56E3XsOTKV9+zmMnbn/JyyaaqQLp6cI1HgE4WVdtiqXx eVNQ== X-Gm-Message-State: AOAM530s07gYXdbukDhT3Itd1+WD7pi2btE6yPWpyLE3WL8v/iVXcFjZ fAj0OEiO29XmBISSlGwbD9b6qVKizfOD31z4mt/Kcpyo X-Google-Smtp-Source: ABdhPJzDVUu315OSMNTtWyBq9wS9eOSA+Ll8eYLR3ChmgvZ0jD6UR8rePBG3geun6+aAcj5O4rk0n3HlPOc4uj9XuFw= X-Received: by 2002:a05:6a00:1909:b0:49f:a0d0:abcf with SMTP id y9-20020a056a00190900b0049fa0d0abcfmr8992992pfi.70.1636195988078; Sat, 06 Nov 2021 03:53:08 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 6 Nov 2021 03:53:07 -0700 In-Reply-To: <83o86xbpkk.fsf@gnu.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=stefankangas@gmail.com; helo=mail-pg1-x536.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.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:278856 Archived-At: Eli Zaretskii writes: > 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? (I don't know how Glenn has done it until now.) AFAIK, there is no strong need to name that file etc/NEWS until we create a tarball or run "make install". I think we should just keep the file in etc/NEWS.NN even on the release branch. That would avoid the merging headache, and the file would also preserve its full history between versions (no more moving the file). If we want to do this, our build-scripts depend on there being an etc/NEWS file, so they would need to be updated.