On Thu, Jul 24, 2025 at 12:30:58AM +0200, Bruno Haible wrote: > Me too. To note that Gavin also have the same configuration and it works well for him.
> > The new changes are pulled on top of the ChangeLog, but my changes have > > disappeared. > > If you check (e.g. with "gitk"): Have the changes to ChangeLog really > disappeared? Or are they present, but 50 or 100 below the top of ChangeLog? Yes they really disappeared. You can see it with the following commits in Texinfo: I did these two commits, each originally with its ChangeLog entry (you can see that with the logs, they are automatically generated based on the CHangeLog last entry): https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=fabe2438e9d261f561c25f2ad27103fa9415ec99 https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=ec28bdf6055cc0bcead4b38a1b2ac6a1aef27978 At the same time, Gavin did some commits too, that he pushed before me (for example the "const for info" commits). Then I do a git pull --rebase The ChangeLog entries disappeared completly from my two aforementionned commits then. I readded them in a separate commit (I could amend or, here since there are two commits, reset or modify, but I am lazy, and it helps showing the issue with git-merge-changelog): https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=6e8b2a0d8cbaa4f78d05d9bab1f1d08db3b66b82 Then I push the 3 (2+1) commits. > If they have really disappeared — which never happened for me — I would > guess that your /tmp or $TMPDIR is full. Does not seems so, I have plenty of room there. Sometime my home becomes full, I could make sure next time that it is not the case. -- Pat
