From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Payas Relekar Newsgroups: gmane.emacs.devel Subject: Re: Progress on merging Eglot? Date: Mon, 19 Sep 2022 22:02:05 +0530 Message-ID: <875yhjz5jh.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="20925"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.8.9; emacs 29.0.50 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Sep 19 18:55:50 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 1oaK3h-0005Ep-AN for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 18:55:49 +0200 Original-Received: from localhost ([::1]:54170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaK3g-0005dj-9T for ged-emacs-devel@m.gmane-mx.org; Mon, 19 Sep 2022 12:55:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaJje-0003Gm-UH for emacs-devel@gnu.org; Mon, 19 Sep 2022 12:35:07 -0400 Original-Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:43726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaJjc-0000Oy-GL for emacs-devel@gnu.org; Mon, 19 Sep 2022 12:35:06 -0400 Original-Received: by mail-pj1-x1031.google.com with SMTP id o70-20020a17090a0a4c00b00202f898fa86so6652524pjo.2 for ; Mon, 19 Sep 2022 09:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:user-agent:from:to:cc:subject:date; bh=b8RLrOz4D9RhCHZu6sByp4+9z4MmgQUs/mWpyaZ8YTk=; b=Rs8+ilFMXp+5iDhJtZEWDRV3+qp6vhbsQcqoJ+t/odzgcCPinzekEuLCphS/EeMNHB AwEazoKwuOOm1GvoheRHjAXK1jxyKHvaZdj5LcKNWMRRRmnttDiu3WkESpmpXVWlhj5O YY+biEp9YcyakAm70ZfA5zvZfhI2QWj5k/YHpHIYiltO9N//z+W4f+NvA4v11cNbC0zr 1qTgig9Vr9BON9akxhsMumWZ/iaWbsBcyBA4aYlnzshF3wKpkUCjoG/Ur9w+qKNe2e7x Ae+/73JGVAQuT2oQ1QfBsU398jmlEKUgme1h5mBGygAMrY4kPCrITO2+Gil2f6MqKlRl laeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:user-agent:x-gm-message-state:from:to:cc:subject:date; bh=b8RLrOz4D9RhCHZu6sByp4+9z4MmgQUs/mWpyaZ8YTk=; b=BqK5aHQAjM+aDepKZJSYFoAnPEe3GpbXuhIUp0nUPqO59jUyxNCumfVXwWJay/7QM2 c6CAj8TTh+FQchkGcqpixJhptsVZec7jMyT1T4MqI6b++ypI3wxdiCDyeyi6dgqSrZe3 dPfrVVvcyDsENQd+/HJsMV8g9xzJFIe4Qjn3rEhtaI23GhNz0D9t8IXj27w/nTt/lGh4 k86jM4W6kqKd5mpuhJL++QhiHw5OGYYSp04wxBxipYga9nvBSCsZxRcG1JXFE9C0yVuJ RylO/MLyadlvJSc9H1VlLhQIYwgNAqomuV+S7pT312Y1qDyzodXXV7Qqak2Wv9Sb3GEL sqAA== X-Gm-Message-State: ACrzQf2t4LvTxQYdsZs9k8wNB8W0OphsfLah4dZvlLIVL76Mi9ynyhUv u/eN0lOephragdfLwY7MhEgciibeQsc= X-Google-Smtp-Source: AMsMyM7EdQ35RcG89DhyToh7yP3pDOha/9EUPiFVwKG08UlG03n30jMzvvMsgjYmsuau42x1Ywo1zg== X-Received: by 2002:a17:902:e843:b0:178:29d3:5544 with SMTP id t3-20020a170902e84300b0017829d35544mr553355plg.99.1663605302620; Mon, 19 Sep 2022 09:35:02 -0700 (PDT) Original-Received: from localhost ([150.107.26.19]) by smtp.gmail.com with ESMTPSA id g11-20020aa796ab000000b0053bf1f90188sm21128019pfk.176.2022.09.19.09.35.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 09:35:01 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=relekarpayas@gmail.com; helo=mail-pj1-x1031.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, 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-Mailman-Approved-At: Mon, 19 Sep 2022 12:53:53 -0400 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: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:295723 Archived-At: Jo=C3=A3o T=C3=A1vora writes: > On Mon, Sep 19, 2022 at 4:52 PM Payas Relekar > wrote: > >> .py is well beyond my kindergarten python, but if I had to make a guess >> its probably generating something that Emacs doesn't like. >> > > No, that wasn't it. It probably worked for you because your script clones > a fresh > emacs.git repo without installing the pre-commit hooks. When they are in > place, > the merge is prevented. I haven't investigated why: there is some logic = in > ~/.git/hooks/pre-commit that supposedly nullifies the hook for merges. Possible, every time I made changes to script, I had emacs repo hard reset to upstream master. Maybe try that first? > Anyway, when the hook is laid to rest, the result is something like what I > just uploaded to the scratch/eglot2emacs branch: > > This branch will probably be deleted and re-created frequently as we tweak > the script. > I hope that isn't a problem. Stefan? Excellente! And away we go.... Payas --