From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Mon, 31 Oct 2022 15:35:38 +0000 Message-ID: References: <87h6zkjp9t.fsf@gmx.de> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000be25bc05ec565cfe" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20307"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 31 16:36:52 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1opWqK-00056F-B3 for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 16:36:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opWpW-0007jF-PV; Mon, 31 Oct 2022 11:36:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opWpP-0007aC-Um for emacs-devel@gnu.org; Mon, 31 Oct 2022 11:35:56 -0400 Original-Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opWpM-0002by-CU for emacs-devel@gnu.org; Mon, 31 Oct 2022 11:35:54 -0400 Original-Received: by mail-oi1-x22e.google.com with SMTP id y67so13177172oiy.1 for ; Mon, 31 Oct 2022 08:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=BsIYcpPD6NwLoaYxA2LnRnb+3Ot0Zyl+LTAW+oKh+QQ=; b=A+2bywwKVQPHTVelMt5vOjpAkm6UoibLevwNrGO9UZdXwIuHBVZ5E5xOyj9PzvoprO 5O9ck9uVWR/CnwB/1pTga0Smzhpie47wKXaY5FleSjCowxX6xnbrzmmOyHZgzD0BwXOT P+mq5VIeX/UPWfgTzMKuP4d0eWuJbC01dp6kzTAWdaoNXnZ4hXK5XYQ8ABDUjncdYz/g SUwZzL3EnINVa6PdCAp8BsFQk6pD6D3W440m7uzMg49gxjKw9EeVVpQkpMYshUObS4l9 zFDci6/zZF2PvG3O4nTszIMRLnmv/yaLf8mhdG+WESMUTd6CtGIC+HPzn8H0hweBHJp/ FcFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BsIYcpPD6NwLoaYxA2LnRnb+3Ot0Zyl+LTAW+oKh+QQ=; b=IkyRNB0uKhqdQC52qBKLzwnq4mTaxUNb6LUmvQYoJIgZU4oH88zfuyYsz5Ijrfvkzl 40KEs8dP2kbRl7k+hdPKHWyGIUEamaMm6brl2ImZCYDwoH8bmS+9XpcRwLv3xmImkQsq m/iZb69pKHolG/WnJaVpu4s86gVCObEEcV7ZrkKpQ26kf2MgHEfkaZvl6JqAKKg21Amj cKrbBvYR2jql88j6tn6dyt8Q79DQEYYbhnCQgvXTl3HzcpjUN7rZbo8IQuOwxx324bKZ XoPcXQMATkeY/XlGnPyeqMnZdkgvcFEZFTSQ0EAvqEbcUCSFis2NBYxVWAzvEG8XnS8f 5XuQ== X-Gm-Message-State: ACrzQf0jjBF6tjmJE8PASMksrM1Q8eU0HetHPv6Hq8MNEz3jFe+u9YV2 5q+evYAVsBSjns4PtSVEU//xM69H/1W5uGdgo3YCcuBc X-Google-Smtp-Source: AMsMyM6WDsh/bkt5E5EXCmQ2wy2Ru3m39pCKQB6hyYTqamVyigo7O7TpyRuYFqVFkBuSgLsJEmxngXJxlIYtuCSPTFI= X-Received: by 2002:a05:6808:f91:b0:359:a22e:b047 with SMTP id o17-20020a0568080f9100b00359a22eb047mr7004797oiw.215.1667230550859; Mon, 31 Oct 2022 08:35:50 -0700 (PDT) In-Reply-To: <87h6zkjp9t.fsf@gmx.de> Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=joaotavora@gmail.com; helo=mail-oi1-x22e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298865 Archived-At: --000000000000be25bc05ec565cfe Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=C3=A3o On Mon, Oct 31, 2022, 09:50 Michael Albinus 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. > > --000000000000be25bc05ec565cfe Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I'm away from my machine right now, but I remember ha= ving left a link to the scripts (a gist repository) i used, as well as a &q= uot;practice run" of the merge for inspection in a branch called scrat= ch/eglot2emacs. I had no comments except for a request of a tweak in an aut= hor's email address. I then replaced that branch with feature/eglot2ema= cs, 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, li= sp/progmodes/eglot.el and doc/misc/eglot.texi.

<= /div>
Jo=C3=A3o



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=C2=A0 =C2=A079434 Mar 15=C2=A0 2021 lisp/cus-= load.el
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A021486 Mar 15=C2=A0 2021 lisp/dire= d-loaddefs.el
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A041469 Mar 15=C2=A0 2021 lisp/find= er-inf.el
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A0 =C2=A0812 Mar 15=C2=A0 2021 lisp= /htmlfontify-loaddefs.el
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A013025 Mar 15=C2=A0 2021 lisp/ibuf= fer-loaddefs.el
-rw-rw-r--. 1 albinus albinus 1411746 Mar 15=C2=A0 2021 lisp/loaddefs.el -rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A0 2674 Mar 15=C2=A0 2021 lisp/ps-p= rint-loaddefs.el
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A0 =C2=A0450 Mar 15=C2=A0 2021 lisp= /subdirs.el
# ls -al src/*.[hc]
-rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A01084 Mar 15=C2=A0 2021 src/buildo= bj.h
-rw-rw-r--. 1 albinus albinus=C2=A0 61138 Mar 15=C2=A0 2021 src/config.h -rw-rw-r--. 1 albinus albinus=C2=A0 =C2=A03673 Mar 15=C2=A0 2021 src/epaths= .h
-rw-rw-r--. 1 albinus albinus 241162 Mar 15=C2=A0 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.

--000000000000be25bc05ec565cfe--