From: Payas Relekar <relekarpayas@gmail.com>
To: "João Távora" <joaotavora@gmail.com>
Cc: emacs-devel <emacs-devel@gnu.org>, eliz@gnu.org
Subject: Re: Progress on merging Eglot: update
Date: Sat, 24 Sep 2022 12:35:19 +0530 [thread overview]
Message-ID: <87y1u9fdp4.fsf@gmail.com> (raw)
In-Reply-To: <87bkr58k3y.fsf@gmail.com>
Payas Relekar <relekarpayas@gmail.com> writes:
> João Távora <joaotavora@gmail.com> writes:
>
>> 5. HELP rewrite https://github.com/joaotavora/eglot
>> to list/progmodes/eglot.el
>>
>> I need to come up with a git incantation to run periodically so that
>> the patches that happen in list/progmodes/eglot.el upstream can
>> somehow be applied to the GitHub downstream-used-to-be-upstream.
>
> Can we use git-filter repo in similar manner as we did now, but instead
> of moving to child dir (lisp/progmodes/), we move to parent dir
> (../../)?
>
> Then we can simply force push to github. Admittedly I haven't tested
> this yet, but sounds doable. That way commit history will be preserved
> both ways.
Okay, tested and apparently working. It's a bit convoluted, but seems to
be working..
Here's the steps (assuming eglot/ and emacs/ repos are cloned in same
dir):
***
cd emacs/
# reduce to lisp/progmodes
git filter-repo --subdirectory-filter lisp/progmodes/
# reduce to eglot.el
git filter-repo --path eglot.el
cd ../eglot/
# remove eglot.el (to be pulled from emacs)
git filter-repo --invert-paths --path eglot.el
# add emacs.git as upstream
git remote add emacs ../emacs/
# fetch latest emacs.git with eglot.el
git fetch emacs master
# merge both repos
git merge remotes/emacs/master --allow-unrelated-histories --no-commit
# make a commit
git commit -m "; Merge from emacs.git"
***
Here's a repo with test commit added from emacs.git on top:
https://github.com/bhankas/eglot
I did not check extensively, but on (very) quick skim did not notice any
obvious duplication in the log.
Let me know if its helpful or needs more work.
Thanks,
Payas
--
next prev parent reply other threads:[~2022-09-24 7:05 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 16:48 Progress on merging Eglot? Payas Relekar
2022-09-08 17:09 ` João Távora
2022-09-08 17:09 ` Payas Relekar
2022-09-08 17:16 ` João Távora
2022-09-08 17:26 ` Payas Relekar
2022-09-18 16:31 ` Payas Relekar
2022-09-18 20:30 ` Philip Kaludercic
2022-09-18 20:47 ` Dmitry Gutov
2022-09-18 21:00 ` Philip Kaludercic
2022-09-18 21:11 ` Dmitry Gutov
2022-09-18 21:13 ` João Távora
2022-09-18 21:12 ` João Távora
2022-09-18 21:20 ` Philip Kaludercic
2022-09-18 21:24 ` João Távora
2022-09-19 2:37 ` Stefan Monnier
2022-09-19 4:25 ` Payas Relekar
2022-09-19 4:42 ` Payas Relekar
2022-09-19 7:23 ` João Távora
2022-09-19 9:09 ` Payas Relekar
2022-09-19 9:25 ` Payas Relekar
2022-09-19 9:17 ` Payas Relekar
2022-09-19 14:09 ` João Távora
2022-09-23 15:23 ` Progress on merging Eglot: update João Távora
2022-09-24 4:32 ` Payas Relekar
2022-09-24 7:05 ` Payas Relekar [this message]
2022-09-25 2:46 ` Richard Stallman
2022-09-25 3:04 ` Payas Relekar
2022-09-25 5:04 ` Eli Zaretskii
2022-09-26 12:10 ` Richard Stallman
2022-09-26 12:13 ` João Távora
2022-09-27 16:16 ` Richard Stallman
2022-09-19 12:25 ` Progress on merging Eglot? Stefan Monnier
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=87y1u9fdp4.fsf@gmail.com \
--to=relekarpayas@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=joaotavora@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 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.