Skip to content

Conversation

@inaki-amatria
Copy link
Member

This PR prepares our fork for integration with the latest upstream changes. By introducing this script and applying upstream patches incrementally, we can avoid dealing with a large, monolithic merge commit. Instead, we will be able to review and reason about each upstream change individually, making the update process more manageable and transparent.

@inaki-amatria inaki-amatria requested review from a team and daniel-otero June 19, 2025 15:27
@inaki-amatria inaki-amatria self-assigned this Jun 19, 2025
@inaki-amatria inaki-amatria requested review from d-alonso and removed request for a team June 19, 2025 15:27
@daniel-otero
Copy link

I don't think having the auto-generated files in the paths, adds any value to the process. Quite the contrary, make reading or applying them significantly worse.

Is that really necessary?

inaki-amatria and others added 2 commits June 20, 2025 08:23
Co-authored-by: Daniel Otero <daniel.otero@appentra.com>
@inaki-amatria inaki-amatria force-pushed the feature/AddUpstreamPatches branch from 860c92f to 39b3f3f Compare June 20, 2025 09:08
@inaki-amatria
Copy link
Member Author

I don't think having the auto-generated files in the paths, adds any value to the process. Quite the contrary, make reading or applying them significantly worse.

Is that really necessary?

Fixed. Including the auto-generated files in the patches doesn't add any value. In fact, as you mentioned, it makes the patches harder to read and apply.

I have now removed them. I was initially concerned about preserving the integrity of each individual patch, but that's not necessary in this case. Also, excluding those files significantly improves the speed of the merge process.

@inaki-amatria inaki-amatria merged commit 39b3f3f into codee Jun 20, 2025
1 check passed
@inaki-amatria inaki-amatria deleted the feature/AddUpstreamPatches branch June 20, 2025 10:47
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.

3 participants