Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature module: Fix handling of multiple conflicts per attribute #12

Open
wants to merge 1 commit into
base: main-numpymeson
Choose a base branch
from
Open

feature module: Fix handling of multiple conflicts per attribute #12

wants to merge 1 commit into from

Conversation

Vogtinator
Copy link

  • Attributes without match were never actually added to the list
  • Only the last conflict actually had an effect, earlier results were discarded

@Vogtinator
feature module: Fix handling of multiple conflicts per attribute
79e7c3c 
- Attributes without match were never actually added to the list
- Only the last conflict actually had an effect, earlier results were
  discarded
@Vogtinator Vogtinator mentioned this pull request Mar 28, 2024
Merged
@mattip
Copy link
Member

mattip commented Apr 3, 2024

Also see mesonbuild#11307 which will make this module available in upstream meson

@mattip
Copy link
Member

mattip commented Apr 3, 2024

@seiko2plus, @rgommers could you take a look?

@rgommers
Copy link
Member

rgommers commented Apr 5, 2024

This seems reasonable to me, but it's @seiko2plus's code and it needs to be integrated into his feature branch too in order not to lose this fix when we rebase or discard this fork. So I'll leave it to @seiko2plus to review/incorporate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@Vogtinator @mattip @rgommers