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

LIBKML: fix error when creating a Id field of type integer #11796

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

rouault
Copy link
Member

@rouault rouault commented Feb 4, 2025

Fixes #11773

@rouault rouault added the backport release/3.10 Backport to release/3.10 branch label Feb 4, 2025
@coveralls
Copy link
Collaborator

Coverage Status

coverage: 70.058%. first build
when pulling 4c2e68a on rouault:libkml_id_integer
into 28c687a on OSGeo:master.

@rouault rouault added the funded through GSP Work funded through the GDAL Sponsorship Program label Feb 5, 2025
@rouault rouault merged commit e1c8701 into OSGeo:master Feb 10, 2025
40 checks passed
@rouault
Copy link
Member Author

rouault commented Feb 10, 2025

The backport to release/3.10 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4c2e68a761... LIBKML: fix error when creating a Id field of type integer
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging autotest/ogr/ogr_libkml.py
Auto-merging ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
CONFLICT (content): Merge conflict in ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp

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-release/3.10 release/3.10
# Navigate to the new working tree
cd .worktrees/backport-release/3.10
# Create a new branch
git switch --create backport-11796-to-release/3.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4c2e68a7617f7d6abef0eae928ba0eeed6f59dad
# Push it to GitHub
git push --set-upstream origin backport-11796-to-release/3.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.10

Then, create a pull request where the base branch is release/3.10 and the compare/head branch is backport-11796-to-release/3.10.

@rouault rouault added failed backport and removed failed backport backport release/3.10 Backport to release/3.10 branch labels Feb 10, 2025
@rouault rouault added this to the 3.11.0 milestone Feb 11, 2025
@rouault
Copy link
Member Author

rouault commented Feb 11, 2025

missed the failed backport. Oh well, that can be 3.11 material only after all

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
funded through GSP Work funded through the GDAL Sponsorship Program
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Value 'contour.1' of field contour.ID parsed incompletely to integer 0
3 participants