Skip to content

Conversation

@jdconrad
Copy link
Contributor

This adds additional information about cherry-picking an original change when a decision has been made to add a backport verison.

@jdconrad jdconrad added >docs General docs changes >non-issue :Core/Infra/Transport API Transport client API v9.3.0 labels Nov 18, 2025
@elasticsearchmachine elasticsearchmachine added Team:Core/Infra Meta label for core/infra team Team:Docs Meta label for docs team labels Nov 18, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/core-docs (Team:Docs)

@github-actions
Copy link
Contributor

github-actions bot commented Nov 18, 2025

🔍 Preview links for changed docs

@github-actions

This comment was marked as off-topic.

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

A couple suggestions

2. Use auto-backport from CI to merge change with the newly created transport
version into `9.1`
3. Discover it's necessary for this change to be backported to `8.19`
4. Generate and merge a change to add a transport version for `8.19` into `main`
Copy link
Member

Choose a reason for hiding this comment

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

This step is a little ambiguous. Could you rephrase it to make it more clear the "change" is the original transport version definition, not a new one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I re-did all of the steps to try to make things more clear.

Backport branches that already included the original change can use
auto-backport in CI or cherry-pick the new transport version change. Backport
branches that did not include the original change need to cherry-pick both the
original change and the new transport version change. Summarized steps:
Copy link
Member

Choose a reason for hiding this comment

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

Summarized steps -> For example with the above change that is first backported to 9.1, and subsequently added to 8.19, the sequence of events would look like the following:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed.

@jdconrad
Copy link
Contributor Author

@rjernst Ready for another look.

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

A couple more minor suggestions

and `TV0` into the target branch `9.1`.
2. Discover that `C0` is also required in target branch `8.19`.
3. Create a pull request with target branch `main` for a change (`C1`) to only
update `TV0` (`TV1`) for `8.19`
Copy link
Member

Choose a reason for hiding this comment

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

There shouldn't be any TV1 here, the purpose of the change is to update TV0 to include an additional id for 8.19.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

jdconrad and others added 5 commits November 19, 2025 09:51
Co-authored-by: Ryan Ernst <ryan@iernst.net>
Co-authored-by: Ryan Ernst <ryan@iernst.net>
Co-authored-by: Ryan Ernst <ryan@iernst.net>
Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

LGTM

@jdconrad jdconrad merged commit 2e95aad into elastic:main Nov 19, 2025
11 checks passed
ncordon pushed a commit to ncordon/elasticsearch that referenced this pull request Nov 26, 2025
This adds additional information about cherry-picking an original 
change when a decision has been made to add a backport version.

Co-authored-by: Ryan Ernst <ryan@iernst.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Core/Infra/Transport API Transport client API >docs General docs changes >non-issue Team:Core/Infra Meta label for core/infra team Team:Docs Meta label for docs team v9.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants