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

ogr2ogr: fix GPKG -> Shapefile when field names are truncated (fix #8849, 3.8.0 regression) #8855

Merged
merged 1 commit into from
Nov 28, 2023

Conversation

rouault
Copy link
Member

@rouault rouault commented Nov 28, 2023

No description provided.

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 67.983% (+0.003%) from 67.98%
when pulling f02687a on rouault:fix_8849
into 88102bd on OSGeo:master.

@rouault rouault merged commit 65ae93e into OSGeo:master Nov 28, 2023
30 checks passed
@rouault
Copy link
Member Author

rouault commented Nov 28, 2023

manually backported to 3.8 per 05f2068

@rouault rouault added this to the 3.8.1 milestone Nov 28, 2023
@rouault
Copy link
Member Author

rouault commented Nov 28, 2023

The backport to release/3.8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f02687ad26... ogr2ogr: fix GPKG -> Shapefile when field names are truncated (fix #8849, 3.8.0 regression)
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".

stdout
Auto-merging ogr/ogrsf_frmts/generic/ogrlayer.cpp
Auto-merging ogr/ogrsf_frmts/generic/ogrlayer_private.h
CONFLICT (add/add): Merge conflict in ogr/ogrsf_frmts/generic/ogrlayer_private.h
Auto-merging ogr/ogrsf_frmts/generic/ogrlayerarrow.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.8 release/3.8
# Navigate to the new working tree
cd .worktrees/backport-release/3.8
# Create a new branch
git switch --create backport-8855-to-release/3.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f02687ad26a4270b56d1bb765a1f107258bbb4f2
# Push it to GitHub
git push --set-upstream origin backport-8855-to-release/3.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.8

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

@rouault
Copy link
Member Author

rouault commented Dec 16, 2023

was cherry picked to 3.8 per 05f2068

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants