From: "João Távora" <joaotavora@gmail.com>
To: Payas Relekar <relekarpayas@gmail.com>
Cc: Michael Albinus <michael.albinus@gmx.de>, emacs-devel@gnu.org
Subject: Re: Emacs git repo mangled
Date: Mon, 31 Oct 2022 16:11:54 +0000 [thread overview]
Message-ID: <87o7tsug51.fsf@gmail.com> (raw)
In-Reply-To: <875yg0ypvp.fsf@gmail.com> (Payas Relekar's message of "Mon, 31 Oct 2022 20:55:27 +0530")
Payas Relekar <relekarpayas@gmail.com> writes:
> Michael Albinus <michael.albinus@gmx.de> writes:
>
> Adding João Távora as maintainer of Eglot.
>
> I did write initial sctipts to merge eglot to emacs.git, and might be
> able to take a look tomorrow.
>
> However, considering these commits are already merged, I am not aware of
> what the policy is on history rewrites, João might be best to suggest
> a solution.
I've now looked at the situation, and I still don't understand what's
wrong. 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.
Graphically and summarily, this is how the tree looks like now.
HTH
master f/eglot-texi-manual f/eglot2emacs
. . .
| . .
|
final merge | . .
(1e5b753bf4) *<-------\
| ---------+ .
| |
| merge with *<--\ .
| manual branch| --------\
| (1e5b753bf4) | ----\
emacs history >* | |
| * |
| tweaks to manual | |
| * |
| | *
emacs history >* * | lots of eglot
| | | history (includes
| Eli's commit | * some branching, but
| (1e5b753bf4) * | majority is linear).
| | |
| / *
emacs history >* /--- |
| /--- *
| /--- |
| /--- |
+- |
| |
| * Initial commit creating
emacs history> * lisp/progmodes/eglot.el
(baa39e48) | (1e5b753bf4)
*
|
.
.
.
next prev parent reply other threads:[~2022-10-31 16:11 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 15:25 Emacs git repo mangled Payas Relekar
2022-10-31 16:11 ` João Távora [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2022-10-31 9:50 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
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
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o7tsug51.fsf@gmail.com \
--to=joaotavora@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
--cc=relekarpayas@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).