[FFmpeg-devel] [RFC] Cherry picks vs merges

[Michael Niedermayer]

Hi all

almpeg is now merged upto 1 months ago. (and since last merge it contains
bits of AGPL code)

The question now is, how does the community want to proceed from here?

I think there are mainly 2 options

1. People review almpeg/master, fix any issues they want fixed, change anything
   they want changed and then we just "git merge" it.

2a. People cherry pick individual commits one by one and or diff between
    almpeg and mainline and post these for review like any other patches
2b. People review these patches
2c. patches or almpeg is updated according to reviews and this is repeated
    until everyone is happy
2d. patches are applied to mainline and the diff between almpeg and mainline
    decreases. (so one can always consider diff hunks to be things that need
    to be worked on either update almpeg to mainline or mainline to almpeg)

I do intend to post a small set of patches from almpeg so we can
see how the cherry picking style method would work.
How merging would look you can basically see in almpeg/master already

Into which of the 2 options would you be more eager to put your time?
(I think it really matters where you want to put your time not so
much where you want others to put their time ...)

PS: also theres STF, is someone interrested in doing more patch reviews when it
is payed ? If so, say something, i think we either way need more reviewers and
STF would be one way to incentivize more reviewing

PS2: yes we can vote about cherry pick vs merge if people want but i suspect
its more a question about will and time than vote.

thx

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

What is kyc? Its a tool that makes you give out your real ID, while criminals
give out a forged ID card.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250601/c7ec9181/attachment.sig>