[Debichem-devel] Bug#1097201: Bug#1097201: libint2: diff for NMU version 2.7.2-1.2

[Santiago Vila]

On Wed, Oct 22, 2025 at 08:52:50PM +0300, Adrian Bunk wrote:

> manual merging as Michael did

Michael did not do any merge commit. He added the missing entries to
debian/changelog in a commit saying "Acknowledge NMU", but as I
already said there was no commit which exactly matched NMU -1.1.

In my book that's not ok and that's why I decided to fix it.

After that, the current way to ack the last two NMUs now is by
actually having them in the repository, properly tagged.

> > so I'm going to add a
> > single commit to match 2.7.2-1.1, then I will add the proper tag, then
> > I'll add the NMU from Adrian which has just arrived to unstable, also
> > with tags. Then we will be in sync with the archive.
> >...
> 
> And then you git merge the previous state of the repository?

No, the previous state was related to a new upstream release which
never happened, it would be quite pointless to restore it. That's why
I added a paragraph in my reply requesting Michael not to commit
things when they are not expected to happen, as it can create troubles
in the long run, as in this case.

Thanks.