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.

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

handle when you combine increments without a base equals #177

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

djay
Copy link

@djay djay commented Mar 17, 2014

This bug can result in not all values in your increments making it into the final value. Fixes issue #176

@djay
Copy link
Author

djay commented Mar 17, 2014

@tseaver @jimfulton Hoping this fix is suitable?
Very keen to see this issue fixed in a release as I've lost too many hours trying to work around this.

@tseaver
Copy link
Contributor

tseaver commented Mar 17, 2014

I'm not really up on the guts of the '+=' implementation, but the test looks like it illustrates the problem clearly, and I can kind of see how your fix works. I'll let @jimfulton have a crack at commenting / merging: bug me in a couple of days if the issue hasn't moved forward.

@djay
Copy link
Author

djay commented Mar 28, 2014

ping @jimfulton, @tseaver if you have time look over this change I'd really appreciate it.

@djay
Copy link
Author

djay commented Apr 7, 2014

@jimfulton @tseaver still keen to get an answer if this can be merged.

@djay
Copy link
Author

djay commented May 1, 2014

@mgedmin @jimfulton @tseaver I'm pretty happy with this pull request. Can I just merge it?

@tseaver
Copy link
Contributor

tseaver commented May 1, 2014

@djay OK by me to merge.

@djay
Copy link
Author

djay commented May 13, 2014

@tseaver actually forgot I don't have permission to merge it on this repo. Can someone merge for me please? @mgedmin @jimfulton

@@ -10,6 +10,9 @@ Unreleased
- Add ``BUILDOUT_HOME`` as an alternate way to control how the user default
configuration is found.

- Fix edgecase where using multiple inheritance and increments can result in
some increments not being included in the final value
Copy link
Member

Choose a reason for hiding this comment

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

"Edge case" is two words.

Other changelog entries end with a final period, perhaps it would be good to follow that convention.

It would also be good to link to a bug report.

@mgedmin
Copy link
Member

mgedmin commented May 14, 2014

I tried to do some code review. I'm not comfortable merging this at this point (see my line comments).

Also, merge conflicts. It would be nice if you could resolve them, @djay. I'm not sure what the best approach is: rebasing and force-pushing (I'm leaning towards it) or merging master into your branch and pushing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants