Skip to content

Conversation

@jmckenna
Copy link
Member

No description provided.

@jmckenna jmckenna added Work in progress Not ready for merging yet backport branch-8-4 To backport a pull request to branch-8-4 labels Nov 13, 2025
@jmckenna jmckenna changed the title update for 8.6.0-beta1 release update for 8.6.0-beta2 release Nov 18, 2025
@jmckenna jmckenna added backport branch-8-6 (live) To backport a pull request to branch-8-6 and removed backport branch-8-4 To backport a pull request to branch-8-4 labels Nov 18, 2025
@jmckenna jmckenna self-assigned this Nov 18, 2025
@jmckenna jmckenna removed the Work in progress Not ready for merging yet label Nov 18, 2025
@jmckenna jmckenna merged commit b6e8054 into MapServer:main Nov 18, 2025
3 checks passed
@github-actions
Copy link
Contributor

The backport to branch-8-6 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 2e3dd12040b5c7a860a5a51c56c2ee5179f2965b is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-1049-to-branch-8-6 13335e17] update for 8.6.0-beta1 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Thu Nov 13 16:40:31 2025 -0400
 7 files changed, 27 insertions(+), 71 deletions(-)
[backport-1049-to-branch-8-6 e2dc9a9c] update for 8.6.0-beta1 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Thu Nov 13 16:45:11 2025 -0400
 2 files changed, 203 insertions(+)
 create mode 100644 en/development/announce/8-6.txt
 create mode 100644 en/development/changelog/changelog-8-6.txt
[backport-1049-to-branch-8-6 4aeb1591] update for 8.6.0-beta2 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Tue Nov 18 12:00:18 2025 -0400
 7 files changed, 29 insertions(+), 8 deletions(-)
[backport-1049-to-branch-8-6 802c503d] update for 8.6.0-beta2 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Tue Nov 18 12:04:37 2025 -0400
 1 file changed, 2 insertions(+), 2 deletions(-)
[backport-1049-to-branch-8-6 e501b876] update for 8.6.0-beta2 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Tue Nov 18 12:12:28 2025 -0400
 1 file changed, 1 insertion(+)
[backport-1049-to-branch-8-6 c2ea96b8] update for 8.6.0-beta2 release
 Author: Jeff McKenna <jmckenna@gatewaygeomatics.com>
 Date: Tue Nov 18 12:16:52 2025 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-branch-8-6 branch-8-6
# Navigate to the new working tree
cd .worktrees/backport-branch-8-6
# Create a new branch
git switch --create backport-1049-to-branch-8-6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9ff80230b3f34271c5d28d4a4656dbee46bcc739,71ac2526c135e2fcaa98472045b84c41c20050f1,bef4c7a99114bb293afc797c076cecbde25c1eef,36aa5f804f8b53f6f3c9bb7aed2c450284a9efb1,e5914ba66f125547656870d712d3925a650470fa,f624efbcb577306e61a51b770488b4c86b4be67f,2e3dd12040b5c7a860a5a51c56c2ee5179f2965b,8572ba70c342e28bee42d36184954c425fb520ad,5c7932ebdc7c1c21116604a7696e63ecf291404d,23bceff01a72fd3c9e6fdbcbc2e119aef447e589,5cafe913b326f080e34c2af16804f0459be573d3,56e1b8187003300e9e6c1e16cb562559f3c97ba4
# Push it to GitHub
git push --set-upstream origin backport-1049-to-branch-8-6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-6

Then, create a pull request where the base branch is branch-8-6 and the compare/head branch is backport-1049-to-branch-8-6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport branch-8-6 (live) To backport a pull request to branch-8-6 failed backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant