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

combine_attrs merge errors with compat="minimal" are silenced #5262

Merged
merged 4 commits into from
May 5, 2021
Merged

combine_attrs merge errors with compat="minimal" are silenced #5262

merged 4 commits into from
May 5, 2021

Commits on May 5, 2021

  1. don't catch merge errors when merging attrs

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    a187c4e View commit details
    Browse the repository at this point in the history

  2. raise the merge error from the value error

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    ffc05e6 View commit details
    Browse the repository at this point in the history

  3. add a test to check for compat=minimal

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    2aa3363 View commit details
    Browse the repository at this point in the history

  4. only assign the attrs if the merge succeeded

    @keewis
    keewis committed May 5, 2021
    Configuration menu
    Copy the full SHA
    8b02b61 View commit details
    Browse the repository at this point in the history