Skip to content

Release 5.4 update gdcm#6059

Open
thewtex wants to merge 3 commits intoInsightSoftwareConsortium:release-5.4from
thewtex:release-5.4-update-gdcm
Open

Release 5.4 update gdcm#6059
thewtex wants to merge 3 commits intoInsightSoftwareConsortium:release-5.4from
thewtex:release-5.4-update-gdcm

Conversation

@thewtex
Copy link
Copy Markdown
Member

@thewtex thewtex commented Apr 14, 2026

Updating GDCM to the current release branch on ITK release-5.4.

thewtex and others added 3 commits April 14, 2026 09:36
Code extracted from:

    https://github.com/malaterre/GDCM.git

at commit dacccb6c04ee13f6958359c193f804358f4672d7 (release).
* upstream-GDCM:
  GDCM 2026-03-10 (dacccb6c)
@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps bot commented Apr 14, 2026

Too many files changed for review. (316 files found, 100 file limit)

@thewtex thewtex requested review from blowekamp and hjmjohnson April 14, 2026 13:53
@blowekamp
Copy link
Copy Markdown
Member

One concern I have is when this branch in merged into release and then main. The main branch can be merged with "ours" stragegy to ensure that the changes here don't effect release/main. However, the gdcm sub-tree will have different commits it's unclear to me how best to manage this.

@bradking Any advice on how to manage the sub-tree for updated to a release branch?

@bradking
Copy link
Copy Markdown
Member

The release-5.4 branch is not currently fully merged into main, and has merge conflicts. Since this PR is based on release-5.4, it cannot be merged to main by any strategy without bringing in more history that's not part of this PR. I suggest resolving that outside this PR first.

@blowekamp
Copy link
Copy Markdown
Member

That seems like regular issue with the release-5.4 not being merged into release and main branches

Copy link
Copy Markdown
Member

@hjmjohnson hjmjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no problems with this approach. A careful merge into upstream/main might be needed, but that should not be hard to accomplish.

@thewtex
Copy link
Copy Markdown
Member Author

thewtex commented Apr 14, 2026

We are queuing a number of patches on release-5.4 before careful merge to main

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.

4 participants