This directory contains a set of scripts that help dealing with GitHub PR's for backports or PR's created for review before merging into trunk. These scripts require the following tools (details in the script headers): - curl - svn - git - hub or gh. gh is preferred over hub - jq * create_pr.sh: This script creates a pull request against the 2.4.x branch to backport the given Subversion revisions from trunk. * apply_backport_pr.sh: This script applies the pull request to the Subversion working copy of the branch. It works best with PR's created by create_pr.sh. * apply_trunk_pr.sh: This script applies the pull request to the Subversion working copy of the trunk. * add_rev.sh: This script adds one or more subversion trunk revisions to a PR created with create_pr.sh. * gh-pr-review.sh: This script lists open PRs against 2.4.x (or another branch with -b) and tallies backport votes: author is a committer, each committer approval, and CI passing each count as one; three are needed. Also flags merge conflicts. -a shows only approved PRs (enough votes), -m N shows only PRs with at least N votes, -d includes drafts, -u hides PRs with merge conflicts, -c shows only PRs passing CI, -j gives JSON output, and giving PR numbers shows a detailed breakdown. More details can be found at the top of the scripts. ## Overall workflow 1. Do you work in in your httpd git workspace directly and create a PR when ready. 2. When you are happy with your PR, `apply_trunk_pr.sh` to your trunk SVN checkout and commit it. 3. Use `create_pr.sh` in your httpd git workspace to create your 2.4.x PR. Save the generated STATUS entry. 4. When you are happy with your 2.4.x PR (e.g. CI), add the STATUS entry to 2.4.x SVN. 5. When approved, use `apply_backport_pr.sh` in your 2.4.x SVN checkout to commit it.