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

Double convert 3.3.0 #4934

Merged

Conversation

blowekamp
Copy link
Member

PR Checklist

  • No API changes were made (or the changes have been approved)
  • No major design changes were made (or the changes have been approved)
  • Added test (or behavior not changed)
  • Updated API documentation (or API not changed)
  • Added license to new files (if any)
  • Added Python wrapping to new files (if any) as described in ITK Software Guide Section 9.5
  • Added ITK examples for all new major features (if any)

Refer to the ITK Software Guide for
further development details if necessary.

@github-actions github-actions bot added the area:ThirdParty Issues affecting the ThirdParty module label Nov 6, 2024
@blowekamp
Copy link
Member Author

@dzenanz I had to manually restore a couple files from before the Update script was run. Do you have an example of how those files can remain? How could the Update script be modified to do so?

@dzenanz
Copy link
Member

dzenanz commented Nov 6, 2024

Restored how? I guess that should be accomplished by commands in the short script here:
https://github.com/InsightSoftwareConsortium/ITK/blob/v5.4.0/Modules/ThirdParty/DoubleConversion/UpdateDoubleConversionFromGoogle.sh#L21

@dzenanz
Copy link
Member

dzenanz commented Nov 6, 2024

Mark as ready? And merge?

@blowekamp
Copy link
Member Author

I did a git checkout HEAD~2 src/double-conversion/src/double-conversion-configure.h.in src/double-conversion/CMakeLists.txt and amended to the merge. I am not clear on the environment that the update script operates in to change it to preserve these files.

@dzenanz
Copy link
Member

dzenanz commented Nov 6, 2024

@bradking might have advice.

@hjmjohnson
Copy link
Member

Updating this package is such a rare occurrence that I think we could merge this PR as is.

@bradking
Copy link
Member

bradking commented Nov 8, 2024

It looks like the previous import was done incorrectly, and it's confusing the script. I'll try to build a fixed history.

floitschG and others added 2 commits November 8, 2024 10:22
Code extracted from:

    https://github.com/google/double-conversion

at commit 4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe (v3.3.0).
* upstream-DoubleConversion:
  DoubleConversion 2023-05-18 (4f7a25d8)
@bradking
Copy link
Member

bradking commented Nov 8, 2024

@blowekamp @dzenanz I updated this PR to rebuild the import with corrected history. It looks like the previous import brought the changes already, so this just fixes history so that the next import can succeed.

@blowekamp blowekamp marked this pull request as ready for review November 8, 2024 15:42
@bradking
Copy link
Member

bradking commented Nov 8, 2024

Also, be sure that this is not merged with GitHub's squash merge feature. That will erase the corrected history structure.

@dzenanz
Copy link
Member

dzenanz commented Nov 8, 2024

OK, so merge commit or manual push to master.

@dzenanz
Copy link
Member

dzenanz commented Nov 8, 2024

For posterity (in case someone is curious), #4567 was merged via "Rebase and merge" resulting in 3dcbf20.

@bradking
Copy link
Member

bradking commented Nov 8, 2024

Yes, I recommend merging with a dedicated merge commit rather than a direct push fast-forwarding master. Certainly no rebase or squash.

@hjmjohnson hjmjohnson merged commit 52dd078 into InsightSoftwareConsortium:master Nov 11, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:ThirdParty Issues affecting the ThirdParty module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants