Re: MPS experiment successful

["Gerd Möllmann" <gerd.moellmann@gmail.com>]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Gerd Möllmann <gerd.moellmann@gmail.com>
>> Cc: emacs-devel@gnu.org
>> Date: Wed, 17 Apr 2024 20:41:12 +0200
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> > The packages code will need to be moved aside, yes.  But for the rest,
>> > why shouldn't a simple merge do the job?  They seem to be orthogonal,
>> > by and large.
>> 
>> Coming to think of it again - how would I tell git merge the difference
>> between the package related changes and GC related changes?
>
> Assuming you know at what commit you started working on MPS, make the
> diffs relative to that commit.  If you didn't in parallel work on
> packages as well, there should be no problem.  If you did make changes
> to packages while working on MPS, tough.

Thanks, I thought you meant git merge. Patch formatting could work, but
loses the history, of course. Which wouldn't be very interesting, unless
someone wants to watch me learning MPS. And Emacs internals :-).

> (I'm actually surprised you didn't start a local branch for the MPS
> stuff.  If you did, just make the diffs from that branch.)

Not sure what you mean.

I branched cl-packages from master a longer while ago, on Github. That
branch has the packages stuff, and I merged master into it once in a
while.

Then I branched the igc branch from cl-packages, so it has both the
package stuff and the MPS stuff. And I think I merged cl-packages into
igc once or twice.

And yes, a diff cl-package...igc could work, or what the syntax is.