Repository navigation
docs(skill): spell out the patch refresh commands - #20
Merged
Merged
Conversation
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
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.
The update skill's "Refresh the patches" step said what to achieve but not how, so each bump's agent made up its own way to rebase and regenerate
patches/.It now gives the exact commands. Each patch file is applied with
git apply(the files are plaingit diffoutput, sogit amrejects them) and committed under its file name. Those commits are rebased onto the new tag, and each one is written back out withgit diff. Using the file names as commit messages keeps the numbers through the rebase, gaps like the retired 0004/0005 included. The step also says where the old and new tags come from and how to number a new patch.Proof: I ran the documented commands with old = new =
v0.1.7(the pinned tag) in a fresh upstream clone, andgit statusshowedpatches/byte-for-byte unchanged. A trial rebase onto the latest v0.1.8 nightly stopped on a conflict in 0001 as expected, with the file name kept as the commit subject.