Allow for declaring an oldForkCommit to bring in objects from the active fork for 3 way apply.#386
Open
Toffikk wants to merge 3 commits intoPaperMC:mainfrom
Open
Allow for declaring an oldForkCommit to bring in objects from the active fork for 3 way apply.#386Toffikk wants to merge 3 commits intoPaperMC:mainfrom
Toffikk wants to merge 3 commits intoPaperMC:mainfrom
Conversation
…ive fork for 3 way apply.
This PR extends the updatingMinecraft {} extension by introducing a new oldForkCommit property.
When configured, oldForkCommit behaves similarly to oldPaperCommit, but it targets the active fork defined in the build script rather than Paper.
The main motivation for this change is that the existing oldPaperCommit mechanism often doesn't bring in enough objects,
particularly in nested fork chains (e.g., fork-of-a-fork scenarios), but sometimes in simple Paper forks too, which causes 3-way patch application to fail.
It also enables patch roulette for minecraft source patches for forks, so the ones that host their own instance of it can also have some fun with it and use it to ease their updates.
Toffikk
commented
Apr 26, 2026
|
|
||
| PatchRouletteTasks( | ||
| target, | ||
| coreExt.activeFork.get().name.lowercase(), // TODO: make this lazy |
Contributor
Author
There was a problem hiding this comment.
should this call get() here to get the actual fork name, or should we default to fork?
I assume this get() call is cheap enough for it to be okay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR extends the updatingMinecraft {} extension by introducing a new oldForkCommit property. When configured, oldForkCommit behaves similarly to oldPaperCommit, but it targets the active fork defined in the build script rather than Paper.
The main motivation for this change is that the existing oldPaperCommit mechanism often doesn't bring in enough objects, particularly in nested fork chains (e.g., fork-of-a-fork scenarios), but sometimes in simple Paper forks too, which causes 3-way patch application to fail.
It also enables patch roulette for minecraft source patches for forks, so the ones that host their own instance of it can also have some fun with it and use it to ease their updates.