bug#43725: 28.0.50; Include feature/native-comp into master

[Andrea Corallo]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Andrea Corallo <akrl@sdf.org> writes:
>
>>> Was the patch against the trunk supposed to be included here?
>>
>> Hi Lars, no it wasn't :)
>>
>> In the sense that I'm not sure how do we prefer to proceed with the
>> review and I'm open for inputs on that.
>
> Right.  :-)
>
>> I didn't know if every time I update the branch is worth posting here a
>> 10K+ LOC patch, so I waited.  Also assuming the review will take some
>> time to go through I'm not really sure how this is practical.
>>
>> OTOH as the branch is already in emacs.git should be trivial for
>> reviewers at any point in time to produce the diff and quote the parts
>> they like to discuss.
>
> Sure, that's fine.  That would be
>
> git diff origin/feature/native-comp..origin/master
>
> ?

I think something like this would add into the diff all new commits that
where pushed to master.

One option is to do the same but against the last commit from master
included into the branch (it's easy to identify as just under the last
merge).  ATM would be:

git diff 6c0f1c26d2...origin/feature/native-comp

Other option is to just merge master into native-comp and do the diff
against master.

Not a git wizard so there could be even simpler ways to do that :)

>> Slightly different but related: I wanted to mention that I think would
>> be really good if possible to retain the current history.  That is going
>> for a merge instead of applying a single patch.  I believe this would be
>> of great help for me to maintain the code in the future.
>
> Sure, sounds good.

Great

Thanks

  Andrea