rust-bitcoin / rust-bitcoin / 8508674496

83%

push

github

Merge rust-bitcoin/rust-bitcoin#2627: Introduce new one ACK carve-out rule

<a class=hub.com/rust-bitcoin/rust-bitcoin/commit/9b70c65f5d4d4c7ad9efe8ab6b834e941f9ac4bf">9b70c65f5<a href="https://github.com/rust-bitcoin/rust-bitcoin/commit/6c4f5df3554f82d01e06879d38f27bb6a475d351"> Introduce new one-ack carve out rule (Tobin C. Harding)
<a class="double-link" href="https://github.com/rust-bitcoin/rust-bitcoin/commit/42d02fbd66981fa20063986d0382e4857c8faf04">42d02fbd6</a><a href="https://github.com/rust-bitcoin/rust-bitcoin/commit/6c4f5df3554f82d01e06879d38f27bb6a475d351"> Merge Refactor and One ACK carve outs (Tobin C. Harding)
</a><a class="double-link" href="https://github.com/rust-bitcoin/rust-bitcoin/commit/ebf5b670d4d5cbccad3e4c83105a2d53a297e8e2">ebf5b670d</a> Update test script mention (Tobin C. Harding)

Pull request description:

  Update merge carve-out policy and introduce new rule.

  - Patch 1: Fix stale test script mention
  - Patch 2: Merge current carve-outs into a single carve-out with multiple rules
  - Patch 3: Introduce new carve-out rule

  From patch 3:
  ```
      Introduce new one-ack carve out rule

      Our merge process is being artificially slowed down because of a
      combination of:

      - Using merge-commit merging means PRs often have to be rebased with no
        changes but a different merge base (and force pushed).
      - Trivial changes, like fixing nits, are often force pushed also.
      - Force pushes invalidate ACKs
      - Our devs are spread around the world working at different times

      What this means is trivial force pushes often cause multi day delays in
      merging. To try and alleviate this problem introduce an additional rule
      to the One ACK carve-out so that Andrew can merge PRs that have
      previously been ack'ed by another dev and have only minimal changes.
      The definition of "trivial" is subjective which introduces a burden on
      Andrew to not merge stuff willy-nilly but also allows simple changes to
      the original PR (eg fixed nits that the original reviewer suggested).
  ```

ACKs for top commit:
  apoelstra:
    ACK 9b70c65f5d4d4c7ad9efe8ab6b834e941f9ac4bf confirmed via range-diff that the commit everyone ACKed and this one differ only in `as` vs `has`

Tree-SHA512: 41898e71e05dd73d396a33f98b74dac2028

19066 of 22909 relevant lines covered (83.22%)

16862.49 hits per line