0.17: Pre-branch maintenance #13780

pull DrahtBot wants to merge 3 commits into bitcoin:master from MarcoFalke:Mf1807-preBranchMaint changing 518 files +843 −778
  1. DrahtBot commented at 11:20 AM on July 27, 2018: member

    Some trivial maintenance to avoid having to do it again after the 0.17 branch off.

    (The scripts to do this are in ./contrib/)

  2. Update copyright headers to 2018 eb7daf4d60
  3. Regenerate manpages 2b6a2f4a28
  4. qt: Set BLOCK_CHAIN_SIZE = 220 3fc20632a3
  5. DrahtBot commented at 12:04 PM on July 27, 2018: member

    <!--e57a25ab6845829454e8d69fc972939a-->Note to reviewers: This pull request conflicts with the following ones:

    • #13825 ([wallet] [Do not merge until v0.18] Kill accounts by jnewbery)
    • #13686 (ZMQ: Small cleanups in the ZMQ code by domob1812)
    • #13216 ([Qt] implements concept for different disk sizes on intro by marcoagner)

    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.

  6. fanquake added this to the milestone 0.17.0 on Jul 27, 2018
  7. in src/qt/intro.cpp:26 in 3fc20632a3
      22 | @@ -23,7 +23,7 @@
      23 |  
      24 |  static const uint64_t GB_BYTES = 1000000000LL;
      25 |  /* Minimum free space (in GB) needed for data directory */
      26 | -static const uint64_t BLOCK_CHAIN_SIZE = 200;
      27 | +constexpr uint64_t BLOCK_CHAIN_SIZE = 220;
    


    Empact commented at 2:23 PM on July 27, 2018:

    static?


    luke-jr commented at 10:08 PM on July 29, 2018:

    Is it possible for a constexpr to be non-static?


    kallewoof commented at 7:01 PM on July 30, 2018:
  8. Sjors commented at 12:58 PM on August 2, 2018: member

    Can the copyright headers be a scripted diff?

    Why do we have generated manpages in the repo? (maybe not the right time to address that)

  9. MarcoFalke commented at 1:05 PM on August 2, 2018: member

    @Sjors They can't since the script takes into account the current time to determine what to bump to. So you coulnd't verify the scripted diff without setting the time to the commit time.

  10. Sjors commented at 1:13 PM on August 2, 2018: member

    What if you could pass YEAR=2018 into the script, or if the year is committed first?

  11. MarcoFalke commented at 1:19 PM on August 2, 2018: member

    @Sjors Jup, that'd work. Though, I feel we should do that in a separate pull request.

  12. Sjors commented at 1:30 PM on August 2, 2018: member

    @MarcoFalke that's fine, this is easy enough to review. Is this ready for review or are you planing to add more?

  13. MarcoFalke commented at 1:33 PM on August 2, 2018: member

    I am not aware of anything else that needs to be done pre-branch

  14. Sjors commented at 2:12 PM on August 2, 2018: member

    ACK 3fc2063

  15. MarcoFalke added the label Docs on Aug 2, 2018
  16. kallewoof commented at 2:30 AM on August 3, 2018: member

    utACK 3fc2063

  17. achow101 commented at 9:51 PM on August 6, 2018: member

    utACK 3fc20632a3ad30809356a58d2cf0ea4a4ad4cec3

  18. laanwj commented at 11:41 AM on August 7, 2018: member

    I guess the manpages need to be re-regenerated after #13872 (and possibly again when #13879 goes in) utACK otherwise!

  19. MarcoFalke commented at 1:04 PM on August 7, 2018: member

    @laanwj They'd have to be bumped every time the version is bumped on the 0.17 branch anyway. So imo it can be done later to not invalidate the review here.

  20. laanwj commented at 11:51 AM on August 8, 2018: member

    OK I thought the idea was to generate these just before the branch, but otherwise is ok me too.

  21. laanwj merged this on Aug 8, 2018
  22. laanwj closed this on Aug 8, 2018

  23. laanwj referenced this in commit 78dae8cacc on Aug 8, 2018
  24. MarcoFalke deleted the branch on Aug 8, 2018
  25. DrahtBot locked this on Sep 8, 2021

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-22 18:15 UTC

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