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

doc: Revert "Remove outdated comments" and place comment correctly #23130

Merged
merged 1 commit into from Sep 30, 2021

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Sep 29, 2021

Unfortunately, in #23094 the assumption that #14336 makes comments outdated is wrong. As pointed in #23094 (comment), the #14336 just moved the relevant code a few lines down.

This PR reverts commit ee7891a, and moves the comments into the right place.

I apologize about that.

This reverts commit ee7891a, and moves
the comments into the right place.
@hebasto
Copy link
Member Author

hebasto commented Sep 29, 2021

cc @fanquake

@maflcko
Copy link
Member

maflcko commented Sep 29, 2021

cr ACK 8ff3743

@laanwj
Copy link
Member

laanwj commented Sep 29, 2021

Sorry for merging it so quickly it seemed obvious to me.

@maflcko maflcko added the Docs label Sep 29, 2021
@laanwj laanwj changed the title Revert "doc: Remove outdated comments" doc: Revert "Remove outdated comments" and place comment correctly Sep 30, 2021
@laanwj
Copy link
Member

laanwj commented Sep 30, 2021

ACK 8ff3743

@laanwj laanwj merged commit dbbb7fb into bitcoin:master Sep 30, 2021
@hebasto hebasto deleted the 210929-revert branch September 30, 2021 11:45
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 30, 2021
… comment correctly

8ff3743 Revert "doc: Remove outdated comments" (Hennadii Stepanov)

Pull request description:

  Unfortunately, in bitcoin#23094 the assumption that bitcoin#14336 makes comments outdated is wrong. As pointed in  bitcoin#23094 (comment), the bitcoin#14336 just moved the relevant code a few lines down.

  This PR reverts commit ee7891a, and moves the comments into the right place.

  I apologize about that.

ACKs for top commit:
  MarcoFalke:
    cr ACK 8ff3743
  laanwj:
    ACK 8ff3743

Tree-SHA512: 84aca627bb5b49c06fc172778f9b9407482c5a873ccbc3dc40167e6a8ad0bc60475d6a469c843b7b42712e35cf3fc2d3518923e791d5e0c59628e042acc72747
@bitcoin bitcoin locked and limited conversation to collaborators Oct 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants