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

Unresolved optional substitutions work with config merging #153

Merged
merged 2 commits into from
May 4, 2018
Merged

Unresolved optional substitutions work with config merging #153

merged 2 commits into from
May 4, 2018

Conversation

aalba6675
Copy link
Contributor

@aalba6675 aalba6675 commented May 3, 2018 •
edited
Loading

If the key is in the top layer and base layer, save the base value as the overriden_value

Addresses #154

@coveralls
Copy link

coveralls commented May 3, 2018 •
edited
Loading

Coverage Status

Coverage increased (+0.003%) to 97.922% when pulling ca3346f on aalba6675:fix-merge into 9ca1bf4 on chimpler:master.

@aalba6675
Copy link
Contributor Author

With master branch, the test case alone, will show

>       assert config['foo'] == 42
pyhocon.exceptions.ConfigMissingException: 'No configuration setting found for key foo'

@aalba6675 aalba6675 changed the title Unresolved optional substitutions work config merging Unresolved optional substitutions work with config merging May 3, 2018
darthbear
darthbear approved these changes May 4, 2018
View reviewed changes
Copy link
Member

@darthbear darthbear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thank you for your PR @aalba6675

@darthbear darthbear merged commit 3e673b1 into chimpler:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darthbear darthbear darthbear approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aalba6675 @coveralls @darthbear