[FFmpeg-devel] forgejo merge vs approve

[FFmpeg-devel] forgejo merge vs approve

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 480 bytes --]

Hi

can we have a tag that causes "automerge on approve" ?

so that if i open a pr i can set that tag and if someone approves it, its
merged and i dont have to come back and click that button ?

thx

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Rémi Denis-Courmont]

Le 3 août 2025 14:41:53 GMT+07:00, Michael Niedermayer <michael@niedermayer.cc> a écrit :
>Hi
>
>can we have a tag that causes "automerge on approve" ?
>
>so that if i open a pr i can set that tag and if someone approves it, its
>merged and i dont have to come back and click that button ?

IMO, merging should be an explicit action, just to be on the safe side. It doesn't have to be by the submitter though.

The person approving might not realise that it will immediately merge, as that doesn't typically happen. Also they might just mean to approve whatever bit of the PR they feel competent about, and not necessarily the entire PR.


>
>thx
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Timo Rothenpieler]

[-- Attachment #1.1: Type: text/plain, Size: 573 bytes --]

On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
> Hi
> 
> can we have a tag that causes "automerge on approve" ?
> 
> so that if i open a pr i can set that tag and if someone approves it, its
> merged and i dont have to come back and click that button ?

That is how it should already work normally.
If there is no approval, the merge button turns into a "Auto-Merge when 
checks succeed", and "at least one approval" is said check.

Not sure if being an admin lets you bypass that, but at least I also see 
the "Rebase then fw (When checks succeed)" button.

[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4742 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1272 bytes --]

On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
> On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
> > Hi
> > 
> > can we have a tag that causes "automerge on approve" ?
> > 
> > so that if i open a pr i can set that tag and if someone approves it, its
> > merged and i dont have to come back and click that button ?
> 
> That is how it should already work normally.
> If there is no approval, the merge button turns into a "Auto-Merge when
> checks succeed", and "at least one approval" is said check.
> 
> Not sure if being an admin lets you bypass that, but at least I also see the
> "Rebase then fw (When checks succeed)" button.

ok lets see if that works
I saw one button and i clicked it on
"https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"

lets see if it waits for an approval :)

btw how exactly does that work when a pull request crosses the area
of knowledge of 5 people ?

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

"You are 36 times more likely to die in a bathtub than at the hands of a
terrorist. Also, you are 2.5 times more likely to become a president and
2 times more likely to become an astronaut, than to die in a terrorist
attack." -- Thoughty2


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1283 bytes --]

On Sun, Aug 03, 2025 at 03:26:00PM +0200, Michael Niedermayer wrote:
> On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
> > On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
> > > Hi
> > > 
> > > can we have a tag that causes "automerge on approve" ?
> > > 
> > > so that if i open a pr i can set that tag and if someone approves it, its
> > > merged and i dont have to come back and click that button ?
> > 
> > That is how it should already work normally.
> > If there is no approval, the merge button turns into a "Auto-Merge when
> > checks succeed", and "at least one approval" is said check.
> > 
> > Not sure if being an admin lets you bypass that, but at least I also see the
> > "Rebase then fw (When checks succeed)" button.
> 
> ok lets see if that works
> I saw one button and i clicked it on
> "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"

to clarify, i clicked it twice, once does nothing


> 
> lets see if it waits for an approval :)
> 
> btw how exactly does that work when a pull request crosses the area
> of knowledge of 5 people ?
> 
> thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Some Animals are More Equal Than Others. - George Orwell's book Animal Farm

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 1757 bytes --]

On 8/3/2025 10:28 AM, Michael Niedermayer wrote:
> On Sun, Aug 03, 2025 at 03:26:00PM +0200, Michael Niedermayer wrote:
>> On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
>>> On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
>>>> Hi
>>>>
>>>> can we have a tag that causes "automerge on approve" ?
>>>>
>>>> so that if i open a pr i can set that tag and if someone approves it, its
>>>> merged and i dont have to come back and click that button ?
>>>
>>> That is how it should already work normally.
>>> If there is no approval, the merge button turns into a "Auto-Merge when
>>> checks succeed", and "at least one approval" is said check.
>>>
>>> Not sure if being an admin lets you bypass that, but at least I also see the
>>> "Rebase then fw (When checks succeed)" button.
>>
>> ok lets see if that works
>> I saw one button and i clicked it on
>> "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"
> 
> to clarify, i clicked it twice, once does nothing

If i recall correctly, for whatever reason the first time you click it 
you're selecting one of two or more options it gives you (rebase+ff vs 
merge commit, but i assume the latter is not allowed), then the second 
click is to confirm that selection. It's kinda weird and clunky.

> 
> 
>>
>> lets see if it waits for an approval :)
>>
>> btw how exactly does that work when a pull request crosses the area
>> of knowledge of 5 people ?
>>
>> thx
> 
> [...]
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 1373 bytes --]

On 8/3/2025 10:26 AM, Michael Niedermayer wrote:
> On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
>> On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
>>> Hi
>>>
>>> can we have a tag that causes "automerge on approve" ?
>>>
>>> so that if i open a pr i can set that tag and if someone approves it, its
>>> merged and i dont have to come back and click that button ?
>>
>> That is how it should already work normally.
>> If there is no approval, the merge button turns into a "Auto-Merge when
>> checks succeed", and "at least one approval" is said check.
>>
>> Not sure if being an admin lets you bypass that, but at least I also see the
>> "Rebase then fw (When checks succeed)" button.
> 
> ok lets see if that works
> I saw one button and i clicked it on
> "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"
> 
> lets see if it waits for an approval :)

Looks like it did. It only got merged after i approved it.

> 
> btw how exactly does that work when a pull request crosses the area
> of knowledge of 5 people ?
> 
> thx
> 
> [...]
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Timo Rothenpieler]

[-- Attachment #1.1: Type: text/plain, Size: 1125 bytes --]

On 8/3/2025 3:26 PM, Michael Niedermayer wrote:
> On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
>> On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
>>> Hi
>>>
>>> can we have a tag that causes "automerge on approve" ?
>>>
>>> so that if i open a pr i can set that tag and if someone approves it, its
>>> merged and i dont have to come back and click that button ?
>>
>> That is how it should already work normally.
>> If there is no approval, the merge button turns into a "Auto-Merge when
>> checks succeed", and "at least one approval" is said check.
>>
>> Not sure if being an admin lets you bypass that, but at least I also see the
>> "Rebase then fw (When checks succeed)" button.
> 
> ok lets see if that works
> I saw one button and i clicked it on
> "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"
> 
> lets see if it waits for an approval :)
> 
> btw how exactly does that work when a pull request crosses the area
> of knowledge of 5 people ?
You probably shouldn't mark such PRs for auto-merge on approval.
I'd only use it on more or less obvious/trivial things.

[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4742 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[Alexander Strasser via ffmpeg-devel]

On 2025-08-03 17:04 +0200, Timo Rothenpieler wrote:
> On 8/3/2025 3:26 PM, Michael Niedermayer wrote:
> > On Sun, Aug 03, 2025 at 01:45:17PM +0200, Timo Rothenpieler wrote:
> > > On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
> > > > Hi
> > > > 
> > > > can we have a tag that causes "automerge on approve" ?
> > > > 
> > > > so that if i open a pr i can set that tag and if someone approves it, its
> > > > merged and i dont have to come back and click that button ?
> > > 
> > > That is how it should already work normally.
> > > If there is no approval, the merge button turns into a "Auto-Merge when
> > > checks succeed", and "at least one approval" is said check.
> > > 
> > > Not sure if being an admin lets you bypass that, but at least I also see the
> > > "Rebase then fw (When checks succeed)" button.
> > 
> > ok lets see if that works
> > I saw one button and i clicked it on
> > "https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20093"
> > 
> > lets see if it waits for an approval :)
> > 
> > btw how exactly does that work when a pull request crosses the area
> > of knowledge of 5 people ?
>
> You probably shouldn't mark such PRs for auto-merge on approval.
> I'd only use it on more or less obvious/trivial things.

Fully agree with Timo.

One should act responsibly and only use auto-merge on very small, mostly
trivial changes.

For bigger stuff I think it's best to let either the main author or the
main reviewer do the merge.

Where the author is only possible when they have write access and
with main reviewer I mean a reviewer that fully reviewed the changes and
not only partially.

This is usually the best option because they have a better mental model
of how things work and what gets changed and don't want to introduce
errors themselves when actively merging the changes. So things that might
have been not found yet still have a good chance to pop up last minute.


  Alexander
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] forgejo merge vs approve

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 814 bytes --]

On 8/3/2025 8:45 AM, Timo Rothenpieler wrote:
> On 8/3/2025 9:41 AM, Michael Niedermayer wrote:
>> Hi
>>
>> can we have a tag that causes "automerge on approve" ?
>>
>> so that if i open a pr i can set that tag and if someone approves it, its
>> merged and i dont have to come back and click that button ?
> 
> That is how it should already work normally.
> If there is no approval, the merge button turns into a "Auto-Merge when 
> checks succeed", and "at least one approval" is said check.
> 
> Not sure if being an admin lets you bypass that, but at least I also see 
> the "Rebase then fw (When checks succeed)" button.

Doesn't look like there's a way to bypass the lack of approval within 
the web interface. You'd have to do a manual merge with a push to 
source.ffmpeg.org, i assume.


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".