[Mesa-dev] [PATCH v2 1/2] bin/get-{extra, fixes}-pick-list.sh: add support for ignore list

Emil Velikov emil.l.velikov at gmail.com
Tue Apr 18 15:50:13 UTC 2017


On 18 April 2017 at 16:16, Andres Gomez <agomez at igalia.com> wrote:
> On Mon, 2017-04-10 at 12:15 +0200, Juan A. Suarez Romero wrote:
>> On Fri, 2017-04-07 at 19:38 +0100, Emil Velikov wrote:
>> > On 7 April 2017 at 12:30, Juan A. Suarez Romero <jasuarez at igalia.com> wrote:
>> > > Both scripts does not use a file with the commits to ignore. So if we
>> > > have handled one of the suggested commits and decided we won't pick it,
>> > > the scripts will continue suggesting them.
>> > >
>> > > This commits adds support for a bin/.cherry-ignore-extra where we can
>> > > put the commits not explicitly rejected (those would be in the
>> > > bin/.cherry-ignore) but we want the scripts don't suggest them because
>> > > we know those won't be picked for stable.
>> > >
>> >
>> > Don't see much value in having the extra file. The patch is not
>> > suitable, regardless of how it was flagged.
>> >
>>
>> Ok. I'll send a patch to use .cherry-ignore for all the cases.
>
>  * .cherry-ignore holds the rejections from actual nominations done by
>    developers.
>  * .cherry-ignore-extra holds the rejections from "false positives"
>    raised by the existing scripts.
>
Developers also do "false positives".

If there's value in having the origin, just add a tag the comment.
Some examples below.
Having X ignore files only adds confusion.

# fixes: commit addresses multiple commits, neither of which is in branch
3f2cb699cfe0481f214c709b5a1375caf0a9c7fe android: vulkan: add support
for libmesa_vulkan_util

# stable: The commit addressed an earlier commit ccdd5b3738e which did
not land in branch.
d49d275c415d60ae08dc3e52d8db11f19a44010f anv/blorp: Don't sanitize the
swizzle for blorp_clear

or even

# typod: commit depends on others $quote that have not landed in branch.
# additionally, the commit itself is a noticeable refactoring that had
at least one bug $sha
6c74e7f492b526f16b6ae59b16eb30df14f793c8 i965/blit: Break the guts of
intel_miptree_blit into a helper

Thanks
Emil


More information about the mesa-dev mailing list