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 16:24:15 +0000 Message-ID: References: <87h6zkjp9t.fsf@gmx.de> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000004e8e1d05ec570621" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29162"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Michael Albinus , emacs-devel To: Stefan Kangas 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:24:13 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 1opXa8-0007PU-Pb for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 17:24:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opXZH-0002h5-UU; Mon, 31 Oct 2022 12:23:19 -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 1opXZG-0002eh-IT for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:23:18 -0400 Original-Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opXZF-0002S6-1m for emacs-devel@gnu.org; Mon, 31 Oct 2022 12:23:18 -0400 Original-Received: by mail-ot1-x329.google.com with SMTP id l42-20020a9d1b2d000000b0066c6366fbc3so439671otl.3 for ; Mon, 31 Oct 2022 09:23:16 -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=4bHwpp7yQgZ8sd0x36z8MV3gV68FVRWYQv6n+iaUF28=; b=G0h1UQjy+crztIZqDIXuPoz1Ny78BxwMhlg334YENNQitLVVGzMXd21pYC45XIThCL RcuOApiGnoX90/4B7JhMTsWojaXYlhltrXEqfqqpNcHfYz73XE4uoyauAaHSg6J/Dib1 TJ4NJMbiPAcyUjNUxhxP1XKS19w1ji8eHY7P/NSwgzoGpQIaZyfn1xmSOzJVzv4h8VIn Sr+PM79UmqeE3qq1Fq56tNsMXaGzZT3XEBETtGJNoiy99xnUQEci30YLjdpu5Q5VCpOD TDjzolQlUwb4SFm6y7ZfA5Donz7bIOxOvIY0HyrXXG+rV4402kL1b+2OGy4O4S9A7DzR v2PQ== 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=4bHwpp7yQgZ8sd0x36z8MV3gV68FVRWYQv6n+iaUF28=; b=fpZM3GbvHMHGwE5iK3hw/siLbs6FQTpBi07ByyqVSolfmIs4bVMBqu7Mo0LSNsU/xa 2vLwt5nSinygVR6R9gEQtcpjrGKORQQ+JYijGj7L8JJJHcFQ9aYkuDN+5BwRsss6AhHv D6etcGafR9Ke/aDkA8ggiF53Gmfhy5J/gdo2FV0NNqSOOZnxMT7ruLM9E855bWc9QoBQ KgIOGxmjbBL6ZJo79GyR5sI5+17dgrq294OOqOCsrSTIpajAERRK/+NOdMbjrGrZGtj6 9Anqf8r8yUstzLHVqvFG8mDIGUVLyI83eQGV27VewgSjvIQoVlj2sJXJ3Q+7PQDTseeV T+4A== X-Gm-Message-State: ACrzQf1NebNy92QSn3qGhvZ8neuEqG48LNHvS7DkTZ596ak9kzs34+wK jUn+cblXYblm/zzDU+oI5AuX+jmMW/rKwLQar3A= X-Google-Smtp-Source: AMsMyM6zO5JJczeQ1E1RFlKUaTD5t9Nmk2O+jI+3JjUpOKNuY0pazMKYBNd33jraQdY3Cthj/3pOeOvZQIOVoPiCXYQ= X-Received: by 2002:a9d:117:0:b0:666:e09d:577e with SMTP id 23-20020a9d0117000000b00666e09d577emr7087580otu.93.1667233395673; Mon, 31 Oct 2022 09:23:15 -0700 (PDT) In-Reply-To: Received-SPF: pass client-ip=2607:f8b0:4864:20::329; envelope-from=joaotavora@gmail.com; helo=mail-ot1-x329.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:298871 Archived-At: --0000000000004e8e1d05ec570621 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 31, 2022 at 4:04 PM Stefan Kangas wrote: > > 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. How would one proceed in future merges of git-versioned packages that started outside the Emacs mainline? Are you suggesting it's possible (in a future merge) to bring that first commit out of some commit on master? If so, how? I think git bisect --first-parent should be behave correctly, but I haven't tested. Maybe there's a way to make that the default for git bisections in the Emacs repo? Jo=C3=A3o PS: This is the thread where the merge technique was discussed and the provisional results presented, if it helps anyone: https://lists.gnu.org/archive/html/emacs-devel/2022-09/msg01583.html --0000000000004e8e1d05ec570621 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Mon, Oct 31, 2022 at 4:04 PM Stefan Kangas <stefankangas@gmail.= com> wrote:
>
> Jo=C3=A3o T=C3=A1vora <joaotavora@gmail.com> wr= ites:
>
> > I don't understand what the problem is, beca= use as far as i remember, the
> > merged branch contains only comm= its to two files, lisp/progmodes/eglot.el
> > and doc/misc/eglot.t= exi.
>
> 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.=C2=A0 Something = to remember in future
> merges, I think, but not the end of the = world.

How would one proceed in future merges of g= it-versioned packages
that started outside the Emacs mainline?=C2= =A0 Are you suggesting it's possible
(in a future merge) to b= ring that first commit out of some commit on master?=C2=A0
I= f so, how?

I think git bisect --first-parent shoul= d be behave correctly, but I haven't
tested.=C2=A0 Maybe ther= e's a way to make that the default for git bisections in
= the Emacs repo?

Jo=C3=A3o

=
PS: This is the thread where the merge technique was discussed and
the provisional results presented, if it helps anyone:

--0000000000004e8e1d05ec570621--