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.

Sign up for GitHub

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

Jump to bottom

[Reporting] Make backporting code easier #98071

Closed
tsullivan opened this issue Apr 22, 2021 · 3 comments
Closed

[Reporting] Make backporting code easier #98071

tsullivan opened this issue Apr 22, 2021 · 3 comments
Labels
bug Fixes for quality problems that affect the customer experience (Deprecated) Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead impact:low Addressing this issue will have a low level of impact on the quality/strength of our product. loe:medium Medium Level of Effort low medium

Comments

@tsullivan
Copy link
Member

In x-pack/plugins/reporting there are differences between the master and 7.x branches. This happens because there is some code that was deleted in master but not 7.x, and some code that was added in master but not backported to 7.x

Not backported to 7.x: #64853
Not deleted in 7.x: #52539

The differences have made certain backports a little difficult, and from time-to-time the manual resolution of merge conflicts in the 7.x branch has caused the code to diverge in ways that aren't necessary.

We should be able to find a good in-editor tool like GitLens to compare the branches and edit out differences that don't need to exist. That should help make backporting future changes easier without running into merge conflicts.
@tsullivan tsullivan added the bug Fixes for quality problems that affect the customer experience label Apr 22, 2021
@botelastic botelastic bot added the needs-team Issues missing a team label label Apr 22, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-reporting-services (Team:Reporting Services)

@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-app-services (Team:AppServices)

@botelastic botelastic bot removed the needs-team Issues missing a team label label Apr 22, 2021
@tsullivan tsullivan added AppServicesSync-7-14 (Deprecated) Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead medium low impact:low Addressing this issue will have a low level of impact on the quality/strength of our product. labels Apr 22, 2021
@exalate-issue-sync exalate-issue-sync bot added loe:small Small Level of Effort loe:medium Medium Level of Effort and removed loe:small Small Level of Effort labels Apr 26, 2021
@tsullivan tsullivan added loe:small Small Level of Effort and removed loe:medium Medium Level of Effort labels May 5, 2021
@exalate-issue-sync exalate-issue-sync bot added loe:medium Medium Level of Effort and removed loe:small Small Level of Effort labels May 5, 2021
@petrklapka petrklapka added 1 and removed 1 labels May 6, 2021
@tsullivan
Copy link
Member Author

In x-pack/plugins/reporting there are differences between the master and 7.x branches. This happens because there is some code that was deleted in master but not 7.x, and some code that was added in master but not backported to 7.x

Task Manager was backported in 7.x as it did NOT need to be a breaking change.

Closing this issue via #101342

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Fixes for quality problems that affect the customer experience (Deprecated) Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead impact:low Addressing this issue will have a low level of impact on the quality/strength of our product. loe:medium Medium Level of Effort low medium
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@tsullivan @elasticmachine @petrklapka