go.etcd.io/etcd@v3.3.27+incompatible/hack/patch/README.md (about)

     1  # ./hack/patch/cherrypick.sh
     2  
     3  Handles cherry-picks of PR(s) from etcd master to a stable etcd release branch automatically.
     4  
     5  ## Setup
     6  
     7  Set the `UPSTREAM_REMOTE` and `FORK_REMOTE` environment variables.
     8  `UPSTREAM_REMOTE` should be set to git remote name of `github.com/coreos/etcd`,
     9  and `FORK_REMOTE` should be set to the git remote name of the forked etcd
    10  repo (`github.com/${github-username}/etcd`). Use `git remotes -v` to
    11  look up the git remote names. If etcd has not been forked, create
    12  one on github.com and register it locally with `git remote add ...`.
    13  
    14  
    15  ```
    16  export UPSTREAM_REMOTE=origin
    17  export FORK_REMOTE=${github-username}
    18  export GITHUB_USER=${github-username}
    19  ```
    20  
    21  Next, install hub from https://github.com/github/hub
    22  
    23  ## Usage
    24  
    25  To cherry pick PR 12345 onto release-3.2 and propose is as a PR, run:
    26  
    27  ```sh
    28  ./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345
    29  ```
    30  
    31  To cherry pick 12345 then 56789 and propose them togther as a single PR, run:
    32  
    33  ```
    34  ./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345 56789
    35  ```
    36  
    37