From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Mon, 31 Oct 2022 17:48:24 +0100 Message-ID: <87mt9chrc7.fsf@gmx.de> References: <875yg0ypvp.fsf@gmail.com> <87o7tsug51.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12120"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Payas Relekar , emacs-devel@gnu.org To: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= 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 17:52:03 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 1opY14-0002xY-Op for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 17:52:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opXzt-0003Nf-U6; Mon, 31 Oct 2022 12:50:49 -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 1opXy6-0002tq-84 for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:48:59 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opXxt-0004y7-PI for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:48:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1667234905; bh=fLv2hz9KrubgJXl5JYbs4nxwlR18TCXhrcY8tAAEHXQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=Ff/eCppL95z8TazzhNVluQdZqYRc0fBad6Mu/irpjEV/Lgr6871B/vPIcTglMun8b sQVoAdESkYP8mhZIjEoAVf0LtgGbG8TmTcRz4Wkspv0TwJ6nGuILVzC/9Odq4M6MBa tVPyxu6oBrRQO5pEZ7pmDL+vk2zkhsbGar5qdkaCEcTrc4zmdr6hqB9v36eZtDmHZA VemzfthV8U4siwama8yiDYlN+ryXPY5UI1Z3BpJe9Az1Q4DG2bunhyRE2HWrwXeyVY PlK6R2kH45RkYWFhFM8w/wHak8R1wpLx3mzg8PeI824++baEq5VUrM1mvOTuVuVxee I5VvQ+vyU45Zw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([213.220.151.1]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MOzOw-1oQ9JN1pIy-00PLp1; Mon, 31 Oct 2022 17:48:25 +0100 In-Reply-To: <87o7tsug51.fsf@gmail.com> (=?utf-8?Q?=22Jo=C3=A3o_T=C3=A1vor?= =?utf-8?Q?a=22's?= message of "Mon, 31 Oct 2022 16:11:54 +0000") X-Provags-ID: V03:K1:DaGCw9aD054odiafl3aDKcWIWFdTKfdvy3i/ApQFr6IcM2QSOUY ou5v4GTm3EdnklbZSJq8RZsFWxV0+99F5CfTi11NTX5hOv1PFKBjZdfkp9q+mTQKTBWanu/ 3rhcReH4Qwg70Yv62BlcOyVIcHLUnSGrecMY05u35PMjynnPnx7ko7cTI8ZdpQnuL9F6u+x 5oqb8xnJCyc8MT9UUya2w== UI-OutboundReport: notjunk:1;M01:P0:4fXvnCPqmN0=;Y+r1vUsqNaL6YhTiuil+Iw0jWls S6jC4gixyQ4ykb3K6daSkGCVzAYa9LatFHHhEJs9GdU/v4p/QQox/y9jq5DZ9VmVIuzNtbxU7 08m2Aid1uONd8HCi23eDrnhRnfcHFsdyocaJUExpXVg21oZNobDcStpTBC0BWSueOkpQ7L3l6 P+TXhb5YVPm1f2li4YBE1WcpfMzeSOH/VkEpgpoz7QeQj6iMrrLRPGGA8B5CB+uOJOrsrGZAb 5LzCzAHoIajCxGr4ZS99M5DzxZ1I86A0LP47VqDd7DTrIYKOPSRKSWxQoxUlCmLKZaBoDxH2Q o9gKWeC/rqc/0CPwca2CxSblQp5SZqdUSB2t6z+xA2Sid5wqLJbU1UQgQvnnd4rMXDP3fyot3 N/Pj7wuK0Jds5sedQv0NdZmDb0HBQ4NE78j7WYrbzpodv24rKm7lk02KQAzz+0IekkNgkvXX+ uvW5BKQQkkBqWh4mjyc1xzcUR1dVgUjlOCREPr2Xlw6U/L2GzeqxluNBkWI3TQ55VW/2YTpLB 2hN/wcvP/fhMk7pcaHbcygTZcPOapQwN/FXuB7JOAPMrj+o8CPHFkofdTjx+6RQBhr/c3bsW2 BA+4d/QUzEMRvgspLXxfUt3Gw3Z2Es4QCgYr0drM0S2TnkE2MIinu0DeA2mVvuJ35RLtoYf1L +yeLFDlmPM7pgNBYXqv4ypp3aAXvBA89bteaqgROH9azQbFtrZAOABg+IuTHkW8Etm4uVn+2A lVpmIr6XiFbyk8rfvmbGTUCMCkzjYkuJ2UbSlfucRcSmZpEqQOmqiH2QLnKH55GyQP0fsaxD Received-SPF: pass client-ip=212.227.15.19; envelope-from=michael.albinus@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, 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:298874 Archived-At: Jo=C3=A3o T=C3=A1vora writes: Hi Jo=C3=A3o, > I've now looked at the situation, and I still don't understand what's > wrong.=C2=A0 As I expected the Eglot branch feature/eglot2emacs is just a > branch that shares no initial history with Emacs's mainline until the > merge with commit feature/eglot2texi manual, whose firstcommit, authored > by Eli, branches off the mainline in baa39e48. > > Until that merge feature/eglot2emacs contains no files but > lisp/progmodes/eglot.el so that ls output, after you 'git checkout' to > one of feature/eglot2emacs's commits is for untracked files in your > working directory. > > I detect nothing wrong in the tree: it's exactly what I would expect it > to be. But I don't know exactly what Michael is trying to do. There's nothing wrong with the eglot merge AFAICS. But the respective commits are useless when you run "git bisect" and you land there, because Emacs cannot be compiled based on any of those commits. That was my pain. Best regards, Michael.