(Refactor) QA: wallet_basic: Split wtx expected_fields over multiple lines to minimise merge conflicts #24293

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:qa_wtx_expected_fields_lines changing 1 files +13 −2
  1. luke-jr commented at 11:51 PM on February 8, 2022: member

    This list seems to be high risk of, and trivial to reduce merge conflicts for.

  2. QA: wallet_basic: Split wtx expected_fields over multiple lines to minimise merge conflicts de281eee0c
  3. DrahtBot added the label Tests on Feb 9, 2022
  4. DrahtBot commented at 7:24 AM on February 9, 2022: member

    <!--e57a25ab6845829454e8d69fc972939a-->

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    <!--174a7506f384e20aa4161008e828411d-->

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #24198 (wallet, rpc: add wtxid in WalletTxToJSON by brunoerg)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  5. shaavan commented at 10:06 AM on February 9, 2022: contributor

    I agree that expanding the list in multiple lines avoids the possible risk of merge conflicts.

    But this section of code is not very actively edited by contributors. Specifically, this code section has been untouched since it was introduced two years ago.

    Screenshot of Git Blame:

    Screenshot from 2022-02-09 15-30-32

    And at the time of writing this review, @DrahtBot is showing a single merge conflict (with #24198) for this PR.

    So, considering the frequency with which this section is edited, would you still think this change deserves a separate PR of its own?

    I think it would be better to add this commit along with #24198, as PR is already editing this section.

  6. brunoerg commented at 11:11 AM on February 9, 2022: member

    @shaavan If more people agree on adding it on #24198, I can do it, no problem.

    I agree it would minimize merge conflicts, but I also don't think new fields are added often.

  7. luke-jr commented at 7:28 PM on February 9, 2022: member

    There's also #21260 and was #18570 (closed)

  8. DrahtBot commented at 8:12 PM on March 8, 2022: member

    <!--cf906140f33d8803c4a75a2196329ecb-->

    🐙 This pull request conflicts with the target branch and needs rebase.

    <sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>

  9. DrahtBot added the label Needs rebase on Mar 8, 2022
  10. fanquake commented at 10:54 AM on May 6, 2022: member

    There's also #21260 and was #18570 (closed)

    #21260 ended up closed, and this now has a conflict, so should either be rebased or closed.

  11. fanquake commented at 1:15 PM on May 12, 2022: member

    Closing for now. Feel free to rebase and reopen.

  12. fanquake closed this on May 12, 2022

  13. DrahtBot locked this on May 12, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-14 15:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me