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

ERL-45: Pull request #616 is partially merged #3081

Closed
OTP-Maintainer opened this issue Nov 13, 2015 · 3 comments
Closed

ERL-45: Pull request #616 is partially merged #3081

OTP-Maintainer opened this issue Nov 13, 2015 · 3 comments
Labels
bug Issue is reported as a bug priority:low team:IS Assigned to OTP team IS
Milestone
OTP-18.2

Comments

@OTP-Maintainer
Copy link

Original reporter: saleyn
Affected versions: OTP-18.1, OTP-18.0
Fixed in version: OTP-18.2
Component: eunit
Migrated from: https://bugs.erlang.org/browse/ERL-45

It appears that the pull request https://github.com/erlang/otp/pull/616 was incorrectly merged, such that the definition of the {{_assertReceive}} macro is present (https://github.com/erlang/otp/blob/maint/lib/eunit/include/eunit.hrl#L138), but {{assertReceive}} macro is missing.
@OTP-Maintainer
Copy link
Author

zandra said:

That pull request, including that line, was reverted. The line was readded in https://github.com/erlang/otp/pull/764, though, not sure why. I'll look into it tomorrow. Thanks for noticing! :)

@OTP-Maintainer
Copy link
Author

richardc said:

That line should be removed again. It was probably left there by accident after a merge conflict.

@OTP-Maintainer
Copy link
Author

zandra said:

Ok, I'll remove it. Thanks!

@OTP-Maintainer OTP-Maintainer added bug Issue is reported as a bug team:IS Assigned to OTP team IS priority:low labels Feb 10, 2021
@OTP-Maintainer OTP-Maintainer added this to the OTP-18.2 milestone Feb 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Issue is reported as a bug priority:low team:IS Assigned to OTP team IS
Projects
None yet
Milestone
OTP-18.2
Development

No branches or pull requests
1 participant
@OTP-Maintainer