-
Notifications
You must be signed in to change notification settings - Fork 36.2k
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
Revert "Merge #19606: Backport wtxid relay to v0.20" #20399
Conversation
It seems odd to revert a feature that's already been reviewed and merged. If we think this is unsafe it should also be reverted in the master branch. |
#20317 has no ACKs so far, so it can't be merged right now. It is holding back the next minor release which has already quite a few bugfixes waiting to be shipped. I can't vouch whether the backport is safe or unsafe, but we've never delayed a bugfix release to backport a feature. Also, I think this is the first time ever that a feature was backported to a bugfix release and released before it was released in a major version. If #20317 gets enough review to make it into the release, fine by me. Otherwise the milestone will simply be adjusted by one minor version. Also, no review will be lost. Observing and ACKing an empty diff can be done by anyone. |
(appveyor failure can be ignored, as it is caused by appveyor bumping the compiler version) |
Linking to relevant notes from this week's p2p IRC meeting on reverting #19606. |
…y to v0.20" fa074d2 Revert "Merge bitcoin#19606: Backport wtxid relay to v0.20" (MarcoFalke) Pull request description: The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (bitcoin#20317 (comment), bitcoin#20317 (comment)). Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling `git diff HEAD HEAD~2 | wc` and observing an empty diff. ACKs for top commit: laanwj: Code review ACK fa074d2 Tree-SHA512: 1a1314b9bb85f44696dc307845e80292998d6c9c000e7386c48405e74400d9cd22be6996e555f198da917e04024a1c8e609dfd830759a27fe4070168b0d272bb
…y to v0.20" fa074d2 Revert "Merge bitcoin#19606: Backport wtxid relay to v0.20" (MarcoFalke) Pull request description: The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (bitcoin#20317 (comment), bitcoin#20317 (comment)). Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling `git diff HEAD HEAD~2 | wc` and observing an empty diff. ACKs for top commit: laanwj: Code review ACK fa074d2 Tree-SHA512: 1a1314b9bb85f44696dc307845e80292998d6c9c000e7386c48405e74400d9cd22be6996e555f198da917e04024a1c8e609dfd830759a27fe4070168b0d272bb
The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (#20317 (comment), #20317 (comment)).
Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling
git diff HEAD HEAD~2 | wc
and observing an empty diff.