Re: Reconsider defaults for use-package-vc-prefer-newest

[Stefan Kangas <stefankangas@gmail.com>]

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.

Should be done like this instead:

  1. Create a feature branch from the `main` branch.
  2. Make commits to the feature branch.
  3. Merge the feature branch back to `main`.
  4. Bump the `Version:` header.
  5. Tag `main` with the `Version:` header value.