From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: kickingvegas@gmail.com, suhailsingh247@gmail.com,
emacs-devel@gnu.org, philipk@posteo.net, meedstrom@runbox.eu,
tonyzorman@mailbox.org
Subject: Re: Reconsider defaults for use-package-vc-prefer-newest
Date: Sun, 29 Sep 2024 17:35:42 +0300 [thread overview]
Message-ID: <86ed524jep.fsf@gnu.org> (raw)
In-Reply-To: <CADwFkm=KHQuvj=ny2jNADJyT0cS2F3hukSJK3OrAuYShaYkPEA@mail.gmail.com> (message from Stefan Kangas on Sun, 29 Sep 2024 07:22:10 -0700)
> From: Stefan Kangas <stefankangas@gmail.com>
> 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 <eliz@gnu.org> 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.
next prev parent reply other threads:[~2024-09-29 14:35 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-14 12:09 Reconsider defaults for use-package-vc-prefer-newest Martin Edström
2024-09-19 11:49 ` Philip Kaludercic
2024-09-19 18:50 ` Suhail Singh
2024-09-19 20:11 ` Philip Kaludercic
2024-09-19 20:31 ` Philip Kaludercic
2024-09-20 6:15 ` Eli Zaretskii
2024-09-20 15:14 ` Philip Kaludercic
2024-09-20 15:45 ` Eli Zaretskii
2024-09-20 16:56 ` Philip Kaludercic
2024-09-20 17:37 ` Eli Zaretskii
2024-09-20 20:43 ` Philip Kaludercic
2024-09-21 7:14 ` Eli Zaretskii
2024-09-21 14:31 ` Philip Kaludercic
2024-09-21 15:18 ` Eli Zaretskii
2024-09-21 15:43 ` Philip Kaludercic
2024-09-19 21:02 ` Suhail Singh
2024-09-20 20:34 ` Philip Kaludercic
2024-09-20 23:38 ` Suhail Singh
2024-09-21 7:06 ` chad
2024-09-21 14:27 ` Suhail Singh
2024-09-21 15:59 ` Philip Kaludercic
2024-09-21 19:04 ` Suhail Singh
2024-09-22 15:30 ` Philip Kaludercic
2024-09-22 20:08 ` Suhail Singh
2024-09-25 12:06 ` Suhail Singh
2024-09-25 13:15 ` Philip Kaludercic
2024-09-25 12:07 ` Philip Kaludercic
2024-09-25 15:15 ` Suhail Singh
2024-09-25 20:11 ` Philip Kaludercic
2024-09-25 20:48 ` Suhail Singh
2024-09-29 2:13 ` Richard Stallman
2024-09-29 7:25 ` Philip Kaludercic
2024-09-29 13:55 ` Suhail Singh
2024-09-26 23:23 ` Charles Choi
2024-09-27 0:17 ` Adam Porter
2024-09-27 0:33 ` Suhail Singh
2024-09-27 6:46 ` Eli Zaretskii
2024-09-29 14:22 ` Stefan Kangas
2024-09-29 14:35 ` Eli Zaretskii [this message]
2024-10-11 18:54 ` Suhail Singh
2024-10-12 5:46 ` Eli Zaretskii
2024-09-20 4:57 ` Tony Zorman
2024-09-20 19:37 ` Martin Edström
2024-09-20 21:05 ` Philip Kaludercic
2024-09-21 14:44 ` Philip Kaludercic
2024-09-21 14:58 ` Tony Zorman
2024-09-21 15:10 ` Suhail Singh
2024-09-21 16:09 ` Philip Kaludercic
-- strict thread matches above, loose matches on Subject: below --
2024-09-15 17:38 Martin Edström
2024-09-15 18:24 ` Eli Zaretskii
2024-09-15 19:46 ` Martin Edstrom
2024-09-16 11:34 ` Eli Zaretskii
2024-09-16 15:24 ` Martin Edström
2024-09-16 16:15 ` Martin Edström
2024-09-16 17:57 ` Eli Zaretskii
2024-09-18 14:30 ` Martin Edström
2024-09-15 19:52 Martin Edström
2024-09-15 20:41 ` chad
2024-09-15 21:09 ` Martin Edstrom
2024-09-15 22:12 ` chad
2024-09-15 23:51 ` Martin Edstrom
2024-09-16 11:50 ` Eli Zaretskii
2024-09-16 16:46 ` Martin Edström
2024-09-16 18:10 ` Eli Zaretskii
2024-09-16 20:16 ` Suhail Singh
2024-09-17 11:44 ` Eli Zaretskii
2024-09-19 3:38 ` Suhail Singh
2024-09-19 6:28 ` Eli Zaretskii
2024-09-19 12:08 ` Suhail Singh
2024-09-19 12:39 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86ed524jep.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kickingvegas@gmail.com \
--cc=meedstrom@runbox.eu \
--cc=philipk@posteo.net \
--cc=stefankangas@gmail.com \
--cc=suhailsingh247@gmail.com \
--cc=tonyzorman@mailbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).