From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Mon, 31 Oct 2022 09:04:15 -0700 Message-ID: References: <87h6zkjp9t.fsf@gmx.de> 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="15538"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel To: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= , 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 17:05:57 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 1opXIT-0003uz-M0 for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 17:05:57 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opXGy-0007GF-TH; Mon, 31 Oct 2022 12:04:24 -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 1opXGt-00079J-AS for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:04:19 -0400 Original-Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opXGr-00048S-FQ for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:04:18 -0400 Original-Received: by mail-oi1-x234.google.com with SMTP id r76so6691092oie.13 for ; Mon, 31 Oct 2022 09:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:references:in-reply-to:from:from:to:cc:subject:date :message-id:reply-to; bh=qoSOySulnPAqO+5wATk9qDqr6Hi2I4tCDsKDi83m5ZA=; b=iO2dfgXjoWDJvdH3JBYJZvyDCAH+pdDWwP6mpTaJBsk9HFEikK2dhNxEzNyfU43VK8 ob/DYlfU0UCveSqZT09kx/pEyx+X0zkfmAJPnFBy6TMF40shZCgzTp6wd3r/hQThlt9H 9sekvzkEmtkSim1E+Nrz8aQQ0n/PeJXhOE94Qcxxgt7NEDSvo4pj5NIKVhSkVSP00wcz kfXhPH+lLEXLojiEWJkuexitlmUFBD6iywc+zlb9jKihZAISFv3DqyVeNGaYNSnv5GHN rjt+gd4t651U0n2iAtlbwMpYJax5sO3v+hYICj9nt37WM81eKMd17D9igu4oQgZQbaMb Yi9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date :mime-version:references:in-reply-to:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qoSOySulnPAqO+5wATk9qDqr6Hi2I4tCDsKDi83m5ZA=; b=27BJrPLo4KMxLRp6uf2T79dpfrN8bDCRZcwswQBL5888dvdxMKPzQEppcS4YeCxGAm HDXsVjJy+mcBRBewYHEWbedxivQLJtjFGLzyKY2oUz1dljdf55SING82dAekDHb5L/BS e1zt2wWVpSE8vAFglx3kYBrjzTr/zrvjrJksTRyHF8/AtvdX/qIpE2UxQ9KAqEvKV1Cy JsFrPQf6lJ90eKOv+0lnDbrnXvoXXGgrl/4sbMJifVrt/6VSBxtLLY/suB/wh07Y8Yun 8ewhnRajYTShtS0O/oWJWPetVbaZB0i3YBQrV0Php6wEAo3dDbzNZXFR1LSnA2xT/tuX /dXA== X-Gm-Message-State: ACrzQf30Mj/mlaiIHt5UIf468MN7Y9060LgIjf7Qz/5YEPmg7GviNE3A l0BBQPw0tLpshAs4QVImihtonNFSKurgDRdCUPQ= X-Google-Smtp-Source: AMsMyM756kVvXVtIiBmiZgAto5ERF1qTig0jMWqOIoZUmXq2gr/7xSFexX5h5+BcFcd5PUbDHpInI8/46Ud4xKDSVjI= X-Received: by 2002:a05:6808:14c3:b0:359:ac8d:41e2 with SMTP id f3-20020a05680814c300b00359ac8d41e2mr14508686oiw.92.1667232256074; Mon, 31 Oct 2022 09:04:16 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 31 Oct 2022 09:04:15 -0700 In-Reply-To: X-Hashcash: 1:20:221031:michael.albinus@gmx.de::zKE8Vo3GBZS/dtX5:44gd Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=stefankangas@gmail.com; helo=mail-oi1-x234.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-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:298868 Archived-At: Jo=C3=A3o T=C3=A1vora writes: > 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. AFAICT, the first commit on the eglot branch that was merged (1e5b753bf46a) does not start out from some commit on master, so the rest of the tree just won't be there. Something to remember in future merges, I think, but not the end of the world. git bisect skip seems appropriate here.