all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Michael Albinus <michael.albinus@gmx.de>
To: Gregory Heytings <gregory@heytings.org>
Cc: "Gerd Möllmann" <gerd.moellmann@gmail.com>, emacs-devel@gnu.org
Subject: Re: Emacs git repo mangled
Date: Tue, 01 Nov 2022 16:23:43 +0100	[thread overview]
Message-ID: <8735b2itq8.fsf@gmx.de> (raw)
In-Reply-To: <48c054670f6a015a2cca@heytings.org> (Gregory Heytings's message of "Tue, 01 Nov 2022 13:55:09 +0000")

Gregory Heytings <gregory@heytings.org> writes:

Hi Gregory,

> I don't know what happened exactly, but the Eglot tree has another
> root, so when you are inside that branch you should not see any of the
> files that are part of the Emacs tree (e.g. "Makefile" and
> "configure").  What was the cause of your confusion?

Exactly this: all files were lost, I thought. I'm not so fluent with
git, and so I did panic.

>> - If the bad commit is inside the merge, you won't see it, because
>> you have marked the whole merged subtree as good (by marking the
>> last commit of the merged subtree).
>
> By definition, the bad commit cannot be inside the merged Eglot tree,
> because that three contains only Eglot, not Emacs.  It bad commit
> could be the merge commit, but that one is not excluded during the
> bisection if you mark the last commit before the merge as "good".

That's the eglot case. I was speaking about a merge in general.

>> - It would require manual actions, because first you need to
>> determine the range of the merged subtree in order to mark last
>> commit of this.
>
> That is correct, and it is the price to pay to preserve history when a
> tree with another root is merged.

Sigh.

> Perhaps we could maintain a list of such merges somewhere, with the
> commit SHA of the last commit before each merge.  Or perhaps even a
> commented script, that would do a "git bisect good ..." for each such
> commit.

Don't know, I let it to the git aficionados.

Best regards, Michael.



  reply	other threads:[~2022-11-01 15:23 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-31  9:50 Emacs git repo mangled Michael Albinus
2022-10-31 13:09 ` Gerd Möllmann
2022-10-31 16:43   ` Michael Albinus
2022-11-01  5:44     ` Gerd Möllmann
2022-11-01  9:15       ` Michael Albinus
2022-11-01  9:28         ` Gerd Möllmann
2022-11-01 12:07         ` Gregory Heytings
2022-11-01 13:32           ` Michael Albinus
2022-11-01 13:55             ` Gregory Heytings
2022-11-01 15:23               ` Michael Albinus [this message]
2022-11-01 16:47                 ` Gregory Heytings
2022-11-01 17:19                   ` Eli Zaretskii
2022-11-01 18:25                     ` Gregory Heytings
2022-11-02  5:51                       ` Gerd Möllmann
2022-11-02  9:26                         ` Gregory Heytings
2022-11-01 19:02                   ` Michael Albinus
2022-11-01 19:41                     ` Gregory Heytings
2022-11-02  3:26                       ` Eli Zaretskii
2022-11-02  9:14                         ` Gregory Heytings
2022-11-02 12:59                           ` Phil Sainty
2022-11-02 13:10                             ` Gregory Heytings
2022-11-02 13:49                           ` Eli Zaretskii
2022-11-02 14:27                             ` Gregory Heytings
2022-11-05 10:54                       ` Michael Albinus
2022-11-05 21:58                         ` Gregory Heytings
2022-11-02  2:11                   ` Phil Sainty
2022-11-02 10:56                     ` Robert Pluim
2022-10-31 13:38 ` Andreas Schwab
2022-10-31 16:45   ` Michael Albinus
2022-10-31 15:35 ` João Távora
2022-10-31 16:04   ` Stefan Kangas
2022-10-31 16:24     ` João Távora
2022-10-31 17:28       ` Stefan Kangas
2022-10-31 21:45 ` Gregory Heytings
  -- strict thread matches above, loose matches on Subject: below --
2022-10-31 15:25 Payas Relekar
2022-10-31 16:11 ` João Távora
2022-10-31 16:48   ` Michael Albinus
2022-10-31 17:57   ` Stefan Monnier
2022-10-31 18:33     ` Andreas Schwab
2022-10-31 20:39       ` Stefan Monnier
2022-10-31 21:10         ` Óscar Fuentes
2022-10-31 21:15         ` Andreas Schwab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8735b2itq8.fsf@gmx.de \
    --to=michael.albinus@gmx.de \
    --cc=emacs-devel@gnu.org \
    --cc=gerd.moellmann@gmail.com \
    --cc=gregory@heytings.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.