Dear Maintainer,

*** Reporter, please consider answering these questions, where appropriate ***

   * What led up to the situation?

I configured git-merge-changelog as my merge driver, as documented.

   * What exactly did you do (or not do) that was effective (or
     ineffective)?

Then I did "git pull" in a git repository with a ChangeLog, in which I had
a commit of my own, that modified ChangeLog.

   * What was the outcome of this action?

Either my ChangeLog change was lost (reported at
https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00181.html)
or my ChangeLog change overwrote the first of the pulled
ChangeLog changes (reported at
https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00198.html).

   * What outcome did you expect instead?

I expected the ChangeLog to contain all pulled entries,
plus my own one on top.
That's precisely the point of using 'git-merge-changelog'.

*** End of the template - remove these template lines ***

The patch has been committed upstream as
https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=21b208f43ab851f9d0747cd45ec67b1b3827e8a2
and has been confirmed to fix the issue:
https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00209.html

We believe that the bug you reported is fixed in the latest version of
gnulib, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1110119@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Simon Josefsson <simon@josefsson.org> (supplier of updated gnulib package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Sat, 02 Aug 2025 13:45:49 +0200
Source: gnulib
Architecture: source
Version: 20250303-2
Distribution: experimental
Urgency: medium
Maintainer: Simon Josefsson <simon@josefsson.org>
Changed-By: Simon Josefsson <simon@josefsson.org>
Closes: 1110119
Changes:
 gnulib (20250303-2) experimental; urgency=medium
 .
   * Fix git-merge-changelog.  Closes: #1110119.
Checksums-Sha1:
 c8e359f3840d1c5da94990ab1f914635122f6b62 2904 gnulib_20250303-2.dsc
 c000e4a624d37814a1fa2241110f733b15d6d539 336676 gnulib_20250303-2.debian.tar.xz
Checksums-Sha256:
 0b07a7b74662b010ca4b7d97bf9a13348badafde39588cdac41d2460e8f202eb 2904 gnulib_20250303-2.dsc
 f9f6d900c20411c073e110b3b72c875053ddbd00dea6dd274e639619aa68c36f 336676 gnulib_20250303-2.debian.tar.xz
Files:
 7c3420cfcac82af94cf6e42e65e76f52 2904 devel optional gnulib_20250303-2.dsc
 7f632ad8880dc7e8dae9e3e0947ef90e 336676 devel optional gnulib_20250303-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----

iQNoBAEWCgMQFiEEo8ychwudMQq61M8vUXIrCP5HRaIFAmiOUfUUHHNpbW9uQGpv
c2Vmc3Nvbi5vcmfCHCYAmDMEXJLOtBYJKwYBBAHaRw8BAQdACIcrZIvhrxDBkK9f
V+QlTmXxo2naObDuGtw58YaxlOu0JVNpbW9uIEpvc2Vmc3NvbiA8c2ltb25Aam9z
ZWZzc29uLm9yZz6IlgQTFggAPgIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYh
BLHSvRN1vst4TPT4xNc89jjFPAa+BQJn0XQkBQkNZGbwAAoJENc89jjFPAa+BtIA
/iR73CfBurG9y8pASh3cbGOMHpDZfMAtosu6jbpO69GHAP4p7l57d+iVty2VQMsx
+3TCSAvZkpr4P/FuTzZ8JZe8BrgzBFySz4EWCSsGAQQB2kcPAQEHQOxTCIOaeXAx
I2hIX4HK9bQTpNVei708oNr1Klm8qCGKiPUEGBYIACYCGwIWIQSx0r0Tdb7LeEz0
+MTXPPY4xTwGvgUCZ9F0SgUJDWRmSQCBdiAEGRYIAB0WIQSjzJyHC50xCrrUzy9R
cisI/kdFogUCXJLPgQAKCRBRcisI/kdFoqdMAQCgH45aseZgIrwKOvUOA9QfsmeE
8GZHYNuFHmM9FEQS6AD6A4x5aYvoY6lo98pgtw2HPDhmcCXFItjXCrV4A0GmJA4J
ENc89jjFPAa+wUUBAO64fbZek6FPlRK0DrlWsrjCXuLi6PUxyzCAY6lG2nhUAQC6
qobB9mkZlZ0qihy1x4JRtflqFcqqT9n7iUZkCDIiDbg4BFySz2oSCisGAQQBl1UB
BQEBB0AxlRumDW6nZY7A+VCfek9VpEx6PJmdJyYPt3lNHMd6HAMBCAeIfgQYFggA
JgIbDBYhBLHSvRN1vst4TPT4xNc89jjFPAa+BQJn0XTSBQkNZGboAAoJENc89jjF
PAa+0M0BAPPRq73kLnHYNDMniVBOzUdi2XeF32idjEWWfjvyIJUOAP4wZ+ALxIeh
is3Uw2BzGZE6ttXQ2Q+DeCJO3TPpIqaXDAAKCRBRcisI/kdFojNUAQDH6nNIr2SJ
PCG4iTDxtq9qk6N35V9JX9nEUzHauFcjpgD/aJ4ICqKYcHqiAhc7negLFzpicVWh
mi6Amz0J8T9d9ws=
=8TsS
-----END PGP SIGNATURE-----

Bruno Haible via Gnulib discussion list <bug-gnulib@gnu.org> writes:

Patrice, is there any chance you could try the latest binary package
from Debian experimental and confirm if it fixes the issue?

I just uploaded gnulib with this patch, although I'm a little uncertain
if it really is applied the right way.  Binaries should hopefully be
available from mirrors in a couple of hours.

There is a small chance we could get Debian trixie to ship with this
fix, and testing helps the release team to make decision.

Is there a small standalone offline way to test if git-merge-changelog
is actually working?  Like a self-check that could be run to check if
the binary is operational?  Then we could add it to the Debian
debci/autopkgtest setup.  To catch future regressions.

Btw, I must admit that I never got git-merge-changelog to work myself
and just gave up on it.  I most likely ran into the same problem you
noticed.. so thanks for following through with a bug report.  I'll see
if I'm able to set it up and use it once this has been confirmed fixed.

/Simon

Simon Josefsson wrote:

For yourself, I'd recommend to use the newest code from gnulib master HEAD,
since it contains an additional improvement compared to the version in Debian.

Bruno

Hi Bruno,

Bruno Haible via Gnulib discussion list <bug-gnulib@gnu.org> writes:

I wonder if it is worth making git-merge-changelog it's own package. It
is also packaged in FreeBSD and Fedora [1][2].

I'll have a look at updating the FreeBSD one. But unfortunately I do
not know how how the Fedora packaging process works so I cannot help
there (ironic since I use it much more than FreeBSD). I submitted a bug
report for the maintainer though [3].

Collin

[1] https://packages.fedoraproject.org/pkgs/gnulib/git-merge-changelog/
[2] https://www.freshports.org/devel/git-merge-changelog/
[3] https://bugzilla.redhat.com/show_bug.cgi?id=2386224

Simon Josefsson wrote:

The binary of 20250303-2, from
https://packages.debian.org/experimental/git-merge-changelog ,
works as expected for me: It no longer destroys ChangeLog entries.
In a "git pull" situation without explicit '--rebase' option, it
doesn't put the locally added ChangeLog entry at the top; that is
how it worked for me for several years, but it not as good as
gnulib master HEAD.

I plan to add unit tests...

Bruno

The package from experimental works well for me.

We believe that the bug you reported is fixed in the latest version of
gnulib, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1110119@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Simon Josefsson <simon@josefsson.org> (supplier of updated gnulib package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Sat, 16 Aug 2025 14:41:27 +0200
Source: gnulib
Architecture: source
Version: 20250303-3
Distribution: unstable
Urgency: medium
Maintainer: Simon Josefsson <simon@josefsson.org>
Changed-By: Simon Josefsson <simon@josefsson.org>
Closes: 1110119
Changes:
 gnulib (20250303-3) unstable; urgency=medium
 .
   * Upload to unstable.
 .
 gnulib (20250303-2) experimental; urgency=medium
 .
   * Fix git-merge-changelog.  Closes: #1110119.
Checksums-Sha1:
 2480691c0e867670765a1f79d739dab93944b7b1 2642 gnulib_20250303-3.dsc
 7cfabcaaccd44fe6f7a17b73cec091636442a7de 336708 gnulib_20250303-3.debian.tar.xz
 606afdbfda8c197de4a1b0a430e6a4e796e863db 183393420 gnulib_20250303-3.git.tar.xz
 683d69ae8227e1793353cced2eacddb8326101dd 18062 gnulib_20250303-3_source.buildinfo
Checksums-Sha256:
 52a611e34a0e29e7b902a6d2cf0139eb3ac267d0e9c719f467f7cf93bc5cee42 2642 gnulib_20250303-3.dsc
 7135f98aed29ac41596dfe25a5c817d2e399ef06389d2d6afdddf7ec9e218c72 336708 gnulib_20250303-3.debian.tar.xz
 01d067b9a809e7c60986be20a82d288621bc422086529825f66bcd4af7cd1e5b 183393420 gnulib_20250303-3.git.tar.xz
 a7fdfdf8f506b968508297e8ced8967145f9965754f905b017b54d18b75f41ad 18062 gnulib_20250303-3_source.buildinfo
Files:
 59989e6d2780158391400ea81644210e 2642 devel optional gnulib_20250303-3.dsc
 f1b61f398e3b204b79636056c4075d2a 336708 devel optional gnulib_20250303-3.debian.tar.xz
 bd3aa380a015fdf08afc5118ba6fb4bc 183393420 devel optional gnulib_20250303-3.git.tar.xz
 33d245861a63c9c6a03ad6394f9d0619 18062 devel optional gnulib_20250303-3_source.buildinfo
Git-Tag-Info: tag=c4aa0ad47101a58d898186d8676facaf33f5371d fp=a3cc9c870b9d310abad4cf2f51722b08fe4745a2
Git-Tag-Tagger: Simon Josefsson <simon@josefsson.org>
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmigfw8ACgkQYG0ITkaD
wHmwkg//RmnGGs5ixwPh5oK0lcMTNqzVUSbEwUIz3romMhyDxPx1ap1bS5DZ/bGi
r0rfDj89HdnTPKsjOW9XHW1iATExNiEJSPcQILKfYaohhUDtF5fLRfFeF7VzRgMO
+q175nOTaHJb4IU/F+d6l7RFyJVV7BqWtmejoVsqISoLb0cVLf1uN285olBQPAeU
wjQgSM71RCG28onJSK6oB6MyQBd7ETUXrvGpkwtI4MxyGIqkpXTNxwxf90DmQQ1U
h8DZxiOPLn/Y9BOw+wc3XUkv6DEsJEIeoe7OH2en3rf1xa7UOzzq0OmvMLR2Of4i
AGUJ+pyMJdf2UKbpjSVL1ar5ajez+5Vc5MJkEWYnt1qhxaI/daVMgUph4zzDReO/
hMlgcwye+3VN9rHHvJacbf/oPn2bTBpRspNxJBn6P2VCMBm6zpPzqLOSbMKzwqWX
EBJO61bJApu6Fy5CIKM6jvGhEnEyJybDkS8Fopmv33N9PA8VjsoC0sGr4l6P5sRB
avLhlF0NoaYt0RJ0iiYhk2/aAnbfAWcqiqzryI5sHk5w+fO7OPhVAp1dkVNy9/t2
5Wd47TBaNvRUyqkgHSRKoZFqqvjJos3OeyZzb83HqquxRytX+hXkAmbn526LikIv
WvROWJgM8G+uCWldaNBUgQARQMERqfrP2fiybMHs7khCTZ0O0JA=
=jMgh
-----END PGP SIGNATURE-----

Hello Simon,

Please consider doing a stable upload with the git-merge-changelog fixes to Debian stable (trixie) after you're comfortable enough that it introduces no regressions.

FWIW, I installed the package from unstable in my Debian trixie box, and it seems to be working just fine.

Thank you!

FWIW, the project below ought to be the "owner" of git-merge-changelog
instead of the Debian 'gnulib' source package.

/Simon

Bruno Haible via Announcements and Requests for Help from the GNU
project and the Free Software Foundation <info-gnu@gnu.org> writes: