Re: Emacs git repo mangled

[João Távora]

I'm away from my machine right now, but I remember having left a link to the scripts (a gist repository) i used, as well as a "practice run" of the merge for inspection in a branch called scratch/eglot2emacs. I had no comments except for a request of a tweak in an author's email address. I then replaced that branch with feature/eglot2emacs, which i generated by exactly the same method.

I don't understand what the problem is, because as far as i remember, the merged branch contains only commits to two files, lisp/progmodes/eglot.el and doc/misc/eglot.texi.

João

On Mon, Oct 31, 2022, 09:50 Michael Albinus <michael.albinus@gmx.de> wrote:

Hi,

In the Emacs git repo there are commits, which do not show all
files. Example:

--8<---------------cut here---------------start------------->8---
# git checkout 6e0ad2ac68820ef197116ea4149ee60f40797a32
# ls -l lisp/*.el
-rw-rw-r--. 1 albinus albinus   79434 Mar 15  2021 lisp/cus-load.el
-rw-rw-r--. 1 albinus albinus   21486 Mar 15  2021 lisp/dired-loaddefs.el
-rw-rw-r--. 1 albinus albinus   41469 Mar 15  2021 lisp/finder-inf.el
-rw-rw-r--. 1 albinus albinus     812 Mar 15  2021 lisp/htmlfontify-loaddefs.el
-rw-rw-r--. 1 albinus albinus   13025 Mar 15  2021 lisp/ibuffer-loaddefs.el
-rw-rw-r--. 1 albinus albinus 1411746 Mar 15  2021 lisp/loaddefs.el
-rw-rw-r--. 1 albinus albinus    2674 Mar 15  2021 lisp/ps-print-loaddefs.el
-rw-rw-r--. 1 albinus albinus     450 Mar 15  2021 lisp/subdirs.el
# ls -al src/*.[hc]
-rw-rw-r--. 1 albinus albinus   1084 Mar 15  2021 src/buildobj.h
-rw-rw-r--. 1 albinus albinus  61138 Mar 15  2021 src/config.h
-rw-rw-r--. 1 albinus albinus   3673 Mar 15  2021 src/epaths.h
-rw-rw-r--. 1 albinus albinus 241162 Mar 15  2021 src/globals.h
--8<---------------cut here---------------end--------------->8---

Looks like such commits belong to the merge of eglot.

Sadly, this makes it almost impossible to bisect the sources (this is
how I found the problem).

Best regards, Michael.