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

Revert "Merge #19606: Backport wtxid relay to v0.20" #20399

Merged
merged 1 commit into from
Nov 23, 2020

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 16, 2020

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.

This reverts commit a339289, reversing
changes made to b9ac31f.
@jnewbery
Copy link
Contributor

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.

@maflcko
Copy link
Member Author

maflcko commented Nov 16, 2020

#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.

@maflcko maflcko added this to the 0.20.2 milestone Nov 18, 2020
@maflcko
Copy link
Member Author

maflcko commented Nov 18, 2020

(appveyor failure can be ignored, as it is caused by appveyor bumping the compiler version)

@adamjonas
Copy link
Member

Linking to relevant notes from this week's p2p IRC meeting on reverting #19606.

@laanwj
Copy link
Member

laanwj commented Nov 23, 2020

Code review ACK fa074d2

$ git fetch upstream pull/20399/head
$ git checkout FETCH_HEAD
$ git diff HEAD HEAD~2 | wc -l
0

(this doesn't work with the merge of this PR to the branch because there was an intermediate merge of #20166 in between, but that's okay, it still applies cleanly)

@maflcko maflcko merged commit 75bf23d into bitcoin:0.20 Nov 23, 2020
@maflcko maflcko deleted the 2011-prepare020release branch November 23, 2020 14:53
MarkLTZ pushed a commit to MarkLTZ/bitcoin that referenced this pull request Nov 26, 2020
…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
MarkLTZ pushed a commit to MarkLTZ/bitcoin that referenced this pull request Nov 26, 2020
…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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 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.

5 participants