Fix duplicate 0067 patch numbering after the 26.3 merges - #879
Merged
Conversation
Master ended up with three patches numbered 0067 and both halves of the same temporary protocol patch. #877 added 0067-Test-that-framed-packets-are-always- direct and 0068-Cipher-into-a-direct-buffer-in-JavaCipher, then #876 added 0067-Temp-26.3-pre-2-protocol-support against an older base, and #878 was meant to rename that to pre-3 but landed as an add, leaving the pre-2 file behind. applyPatches.sh globs the directory, so the two Temp patches both applied in lexicographic order and the second conflicted with the first: Applying: Temp: 26.3-pre-3 protocol support CONFLICT (content): Merge conflict in ProtocolConstants.java CONFLICT (content): Merge conflict in Protocol.java Drop the superseded pre-2 file and renumber pre-3 to 0069 so it sits after #877's patches. The patch content is byte for byte what #878 merged; only the number and the parent it was generated against change.
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.
./waterfall patchis currently broken on master.Three patches ended up numbered
0067, two of which are the same temporary protocol patch:#877 added
0067-Test-…and0068-Cipher-…. #876 then added0067-Temp-26.3-pre-2-…, generated against a base that predated it. #878 was meant to rename that file to pre-3, but with the base drifted it merged as an add, so the pre-2 file stayed behind.applyPatches.shglobsBungeeCord-Patches/*.patch, so both Temp patches get applied in lexicographic order. The second is not an increment on the first — it is the same patch regenerated — so it conflicts:This drops the superseded pre-2 file and renumbers pre-3 to
0069so it sits after #877's two patches.The patch content is byte for byte identical to what #878 merged — I diffed the two ignoring the
From/indexheaders and the trailing version line. Only the number and the parent it was generated against change.Testing
./waterfall patchapplies cleanly from scratch, and the full build and test suite pass.