Skip to content

fix: correct patch commands for recursive diffs#39

Merged
kormide merged 1 commit intomainfrom
correct-recursive-patch
Mar 17, 2026
Merged

fix: correct patch commands for recursive diffs#39
kormide merged 1 commit intomainfrom
correct-recursive-patch

Conversation

@kormide
Copy link
Owner

@kormide kormide commented Mar 17, 2026

To correctly apply a recursive patch in the source tree from one folder dir_a to another dir_b, we need to change directories and subtract the right prefix.

Produces a message like:

ERROR: diff command exited with non-zero status.

To accept the diff, run:
(cd $(bazel info workspace); patch --directory diff/tests/case_recursive.dir_a -p3 < bazel-out/k8-fastbuild/bin/diff/tests/case_recursive.patch)

@kormide kormide force-pushed the correct-recursive-patch branch from 1d90cb7 to 466a2ec Compare March 17, 2026 01:46
@kormide kormide requested a review from alexeagle March 17, 2026 01:47
@kormide kormide force-pushed the correct-recursive-patch branch 5 times, most recently from 13fc2fb to c958d5f Compare March 17, 2026 01:56
@kormide kormide force-pushed the correct-recursive-patch branch from c958d5f to 9e0ac50 Compare March 17, 2026 01:57
@kormide kormide merged commit 6feacf0 into main Mar 17, 2026
12 checks passed
@kormide kormide deleted the correct-recursive-patch branch March 17, 2026 02:00
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.

1 participant