[FFmpeg-devel] Hostile Attitudes

[James Almer]

On 5/8/2016 4:00 PM, Paul B Mahol wrote:
> On 5/8/16, James Almer <jamrial at gmail.com> wrote:
>> On 5/8/2016 2:34 PM, Paul B Mahol wrote:
>>> On 5/8/16, Derek Buitenhuis <derek.buitenhuis at gmail.com> wrote:
>>>> Hi,
>>>>
>>>> I've been doing merges for a while now, and I am happy to continue
>>>> doing them too, but, I grow quite tired of certain individuals doing
>>>> nothing but, for lack of a better term, defecate on my efforts. It's
>>>> really quite demotivating and immediately sours my day.
>>>>
>>>> I am not going to finger point, but everyone on IRC knows who these
>>>> (very few) individuals are. Some of them have not even sent a patch
>>>> in the last N years.
>>>>
>>>> All I ask is that there is some sort of rule set for this. It's not
>>>> productive to sit on IRC and say "merges are useless" and such when
>>>> contributing nothing yourself. Please either actually contribute, start
>>>> a thread trying to reach a consensus to stop merging (IMO unlikely) or
>>>> just keep silent. If you have nothing productive or nice to say, don't
>>>> say anything.
>>>>
>>>> P.S. Does something in our CoC cover this?
>>>
>>> I do not like NOP merges as they are already polluting git history.
>>> I do not like non-trivial merges when they are just broken.
>>>
>>> If there is something really useful use cherry pick.
>>>
>>> I do not like a lot of things, are we going to disallow my rights to state
>>> my opinions?
>>
>> No, you can state your opinion, but constant complains about it doesn't help
>> anyone. Start a thread to discuss your argument in favor of stopping merges
>> as Derek suggested instead.
> 
> I would rather complain about not merged screenpresso and rscc improvements.
> How much until that happens?
> 
> If not going to happen soon I will start cherry picking.

There's a queue, and those are in the queue. Complaining how things moves slowly
is just as bad as complaining about merges happening in the first place.

Assuming it doesn't screw up with the merging scripts then go and cherry-pick,
but wait for confirmation from either Derek or Hendrik since they know how it
works. Just keep in mind doing so will also create even more NOP merges that
you said you dislike.