Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump backport to 4.6.3 #43405

Merged
merged 2 commits into from
Aug 16, 2019
Merged

Bump backport to 4.6.3 #43405

merged 2 commits into from
Aug 16, 2019

Conversation

sorenlouv
Copy link
Member

@sorenlouv sorenlouv commented Aug 15, 2019

Various fixes:

  • Delete origin remote to avoid confusion

v.4.6.3: Open editor automatically

Adds editor option which allows the user to specify an editor of their choice that will be opened if a conflict occurs. Easiest way to use editor option is by adding it to the global config:

{
  "username": "sqren",
  "accessToken": "very_secret_token",
  "editor": "code"
}

v.4.6.2: Disable fork-mode

Adds the ability to create backports in the origin repository instead of in a fork. Fork mode is still the default. To disable fork mode run backport --fork=false or add it to the project config:

{
  "upstream": "elastic/kibana",
  "branches": [{ "name": "7.x", "checked": true }, "7.3", "7.2"],
  "fork": false
}

All changes between v4.6.1 - 4.6.3
https://github.com/sqren/backport/compare/e53de81321481d09741557a77a5926e1874fe2b1..master

@tsullivan
Copy link
Member

tsullivan commented Aug 15, 2019

Adds the ability to create backports in the origin repository instead of in a fork

I've been incorrectly saying the terms "fork" and "origin" interchangeably. I like this change as it makes the naming specialties less of a concern for me as a developer using the tool :)

Copy link
Member

@tsullivan tsullivan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, reviewed the changed lines

@sorenlouv
Copy link
Member Author

sorenlouv commented Aug 15, 2019

I've been incorrectly using "fork" and "origin" interchangeably.

tbh I am still not sure what the correct definition of origin is so getting rid of it seemed like the easiest solution :D

@elasticmachine
Copy link
Contributor

💔 Build Failed

@sorenlouv
Copy link
Member Author

retest

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@sorenlouv sorenlouv merged commit 056ec57 into master Aug 16, 2019
@sorenlouv sorenlouv deleted the bump-backport-to-4.6.3 branch August 16, 2019 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants