v5.3.0

• Add --dry-run option (#182)

5.2.0

• Split conflict resolution and staging into separate steps (#175)
• Add --mainline option (#179)
• Add branchLabelMapping option: Pre-select branches by reading the labels on the source PR (#180)

5.1.2 Fixes to related backports and perf improvement for conflict resolution phase

• Find related backports by looking at mergedCommit.oid
• Improve error reporting by writing the error.message in console and the rest in logs
• Change setInterval to recursive setTimeout to avoid flooding with requests (mostly relevant for huge git repos)

5.1.1 Improved heuristic for finding backported pull requests

Improves the heuristic for finding related pull requests by also matching against the title of the potentially related pull request.

Green indicates a merged backport, and gray indicates a pending backport

#171

5.1.0 Improved merge conflict resolution

When a conflict happens:

1. A list of the conflicting files will be displayed
2. If configured (via "editor" property) the conflicting files will be opened in the user's preferred editor
3. When resolved, the user can return to the backport terminal. The user does not have to stage (git add) or commit their changes - backport will do this for them when they agree to proceed.
4. The backport process will continue as usual: the branch will be pushed and a PR created.

Added in #170

5.0.0 Remove option `apiHostname` and add `githubApiBaseUrlV3` and `githubApiBaseUrlV4`

The option apiHostname is primarily consumed by Github Enterprise users. They will instead have to specify two options: githubApiBaseUrlV3 and githubApiBaseUrlV4.

Fixes:

• ensure that backport -v and backport --version are equivalent (#163)

4.9.0 Send access token via auth header instead of query params

Since Github is deprecating sending access token via query param it should be sent over auth header instead.

https://developer.github.com/changes/2019-11-05-deprecated-passwords-and-authorizations-api/#authenticating-using-query-parameters

#165

4.8.0 Add `--sourceBranch` option to backport from non-master branches

By default the list of commits will be sourced from the repository's default branch (mostly "master"). sourceBranch can be used to list and backport commits from other branches than the default.

Configuration:

// Example .backportrc.json
{
  "sourceBranch": "7.x"
}

CLI: --sourceBranch 7.x

Add `--backport-created-labels` options

This adds the option --backport-created-labels which makes it possible to add labels to the original PR after backport PRs have been created.

// Example .backportrc.json
{
  "upstream": "elastic/kibana",
  "backportCreatedLabels": ["backport-created"],
  "labels": ["backport"]
}

#153

4.7.0 Add log library and `--verbose` option

It's now possible to debug backport by looking at the logs in ~/.backport/backport.log. By default only high-level info will be logged. By using backport --verbose more detailed information will be available.