Skip to content

Instantly share code, notes, and snippets.

@OscarL
OscarL / Updating-Patchsets-101.md
Last active May 28, 2024 21:18
How to update .patchset files for HaikuPorter recipes, when they do not apply cleanly.

Updating HaikuPorter .recipes (and what to do when applying the .patchset fails).

An example-based, step-by-step guide.

TL;DR

> git am <foobar.patchset>
> git apply --verbose --reject .git/rebase-apply/<FAILED_PATCH_NUMBER>
> <edit files as needed here, look for .rej files to know what need manual intervention>