Repository navigation
Conversation
|
Warning Review limit reached
This review includes 1 billable file and costs up to $0.25. Or wait 18 minutes for your next included review. View limit details
Comment |
…atch -b; remove .orig files
markro49
approved these changes
Oct 19, 2026
This branch has not been deployed
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.
Two small fixes to
doc/valgrind-merge.texinfo:DAIKONDIRright after settingINV. "Getting Started" setsDAIKONDIR=$INV/daikon, but a user who follows the cloning example setsINVonly afterward.dwarf.candreadelf.cfrom before the patch, for the visual merge tool: copying them by hand, or adding-bto the actual (not the dry-run)patchcommand that appliesbinutils.patch. It explains whatpatch -bdoes: it saves the original version of each file that it modifies in a.origfile (without-b,patchsaves one only when the patch does not match a file exactly), which is useful for reviewing and undoing the changes and for the visual merge tool. It warns that a second run ofpatch -boverwrites each.origfile with the already-patched file. It says to remove the.origfiles after the merge and how to find them, because.gitignorehides them fromgit status.