From 4f37df7a162a6d080a17ec9ec085864628ac5c01 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Tue, 26 Nov 2024 06:27:35 -0500 Subject: [PATCH 1/2] Minor: Add example of backporting to release branch --- dev/release/README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dev/release/README.md b/dev/release/README.md index cac8ea654f40..e301d013e06d 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -30,7 +30,7 @@ Patch releases are made on an adhoc basis, but we try and avoid them given the f - Once the PR is approved and merged, we tag the rc in the release branch, and release from the release branch - Bug fixes can be merged to the release branch and patch releases can be created from the release branch -#### How to add changes to `branch-*` branch? +#### How to backport (add changes) to `branch-*` branch If you would like to propose your change for inclusion in a release branch for a patch release: @@ -39,6 +39,15 @@ patch release: 1. Follow normal workflow to create PR to `main` branch and wait for its approval and merge. 1. After PR is squash merged to `main`, branch from most recent release branch (e.g. `branch-37`), cherry-pick the commit and create a PR targeting the release branch [example backport PR]. +For example, to backport commit `12345` from `main` to `branch-43`: + +```shell +git checkout branch-43 +git checkout -b backport_to_43 +git cherry-pick 12345 +git push -u +# make a PR as normal +``` [example release issue]: https://github.com/apache/datafusion/issues/9904 [example backport pr]: https://github.com/apache/datafusion/pull/10123 From de6fb4831abbf72b387488ef14b044ad1a7d8087 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Tue, 26 Nov 2024 06:27:51 -0500 Subject: [PATCH 2/2] prettier --- dev/release/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/release/README.md b/dev/release/README.md index e301d013e06d..5dd9b4fc59fd 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -48,6 +48,7 @@ git cherry-pick 12345 git push -u # make a PR as normal ``` + [example release issue]: https://github.com/apache/datafusion/issues/9904 [example backport pr]: https://github.com/apache/datafusion/pull/10123