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: Reconsider defaults for use-package-vc-prefer-newest Date: Sun, 29 Sep 2024 17:35:42 +0300 Message-ID: <86ed524jep.fsf@gnu.org> References: <87wmj7dftf.fsf@posteo.net> <87setvxyt6.fsf@gmail.com> <87jzf7o13b.fsf@posteo.net> <87msk3jr0u.fsf@gmail.com> <87setum5do.fsf@posteo.net> <87msk1520e.fsf@gmail.com> <87settknf1.fsf@posteo.net> <87tte8akwa.fsf@gmail.com> <878qvjaep6.fsf@posteo.net> <87cykvwixn.fsf@gmail.com> <3BC7EB33-504C-4532-A2DF-83712B64878E@gmail.com> <86v7yh8ugg.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24590"; mail-complaints-to="usenet@ciao.gmane.io" Cc: kickingvegas@gmail.com, suhailsingh247@gmail.com, emacs-devel@gnu.org, philipk@posteo.net, meedstrom@runbox.eu, tonyzorman@mailbox.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 29 16:36:46 2024 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 1suv2U-0006Gz-5P for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Sep 2024 16:36:46 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suv1k-0005m6-M1; Sun, 29 Sep 2024 10:36:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suv1i-0005lc-US for emacs-devel@gnu.org; Sun, 29 Sep 2024 10:35:59 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suv1e-0005bk-4L; Sun, 29 Sep 2024 10:35:55 -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=wtrNdH2tzKr5CKljdTbRODAVoQPRxVKt5A8wJAk35Es=; b=PDKxrquU6Vw5 mPxlrv9yayb+xBJPbu4aiIzLKZk0HaeKbU4R1AyzdSZ4y3Q9Ei01drHmvjWbMXaktRbM9wUN8lLkG xHoVeBxmWkAQiqfoGwUiKHOhIUVECVgQHJers7L+TYkcDyKd1vcLEkFLZ6V7panY19sIwvttG4g1a 6CABkLaSlohBpmrGtZa8l2fL7LvGPLxpjTJFBnhua4KkKu2CVOzWgv59Ijz8GRQ/n6kYCQASR47XY 3h/G4nhe6vUiQAm/SqxjHgCkHV8LAi3pYxRxImTVPiC39D7QllhfpiK8m5d6Dc4XzuS9GGjk+437W ifahHFVan40JrEdwnKd9ow==; In-Reply-To: (message from Stefan Kangas on Sun, 29 Sep 2024 07:22:10 -0700) 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:324192 Archived-At: > From: Stefan Kangas > Date: Sun, 29 Sep 2024 07:22:10 -0700 > Cc: suhailsingh247@gmail.com, emacs-devel@gnu.org, philipk@posteo.net, > meedstrom@runbox.eu, tonyzorman@mailbox.org > > Eli Zaretskii writes: > > > The above seems to indicate there's some kind of bug in deciding > > whether there's a commit mismatch, because I don't see anything wrong > > with what you do. > > The problem is the order in which the steps are taken. A git tag should > be added only to those commits that bump the "Version" header, or you > will run into problems. > > In other words, this: > > 1. Create a feature branch from the `main` branch. > 2. Bump the `Version:` header. > 3. Make commits to the feature branch. > 4. Merge the feature branch back to `main`. > 5. Tag `main` with the `Version:` header value. In the original description, step 2 and step 3 were in reverse order, AFAIR, or at least I thought so.