Skip to content

Merge doc: set DAIKONDIR when cloning; explain the .orig files of patch -b - #127

Open
mernst wants to merge 2 commits into
codespecs:masterfrom
mernst:merge-doc-daikondir-backup
Open

mernst wants to merge 2 commits into
codespecs:masterfrom
mernst:merge-doc-daikondir-backup

Conversation

@mernst

@mernst mernst commented Oct 19, 2026 •

Copy link
Copy Markdown
Member

Two small fixes to doc/valgrind-merge.texinfo:

  • "Obtain a copy of Daikon and Fjalar" sets DAIKONDIR right after setting INV. "Getting Started" sets DAIKONDIR=$INV/daikon, but a user who follows the cloning example sets INV only afterward.
  • "Merging the binutils changes" presents the two ways to keep copies of dwarf.c and readelf.c from before the patch, for the visual merge tool: copying them by hand, or adding -b to the actual (not the dry-run) patch command that applies binutils.patch. It explains what patch -b does: it saves the original version of each file that it modifies in a .orig file (without -b, patch saves 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 of patch -b overwrites each .orig file with the already-patched file. It says to remove the .orig files after the merge and how to find them, because .gitignore hides them from git status.

@coderabbitai

coderabbitai Bot commented Oct 19, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

  • Run on-demand review

This review includes 1 billable file and costs up to $0.25.

Or wait 18 minutes for your next included review.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

⚙️ Run configuration
  • Configuration used: Repository: codespecs/fjalar/.coderabbit.yaml
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: 0174f91f-81fa-409e-b821-98251c169e76
📥 Commits

Reviewing files that changed from the base of the PR and between 8cd2517 and fbbefe5.

📒 Files selected for processing: 1
  • doc/valgrind-merge.texinfo
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

This branch has not been deployed

No deployments
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.

2 participants