diff options
| -rw-r--r-- | README | 34 |
1 files changed, 19 insertions, 15 deletions
@@ -21,30 +21,34 @@ TBD: wiggle, merge, ... Tools included: -fix-offsets: can either change offsets using limited expressions (DSL) - to specify the desired offset changes, or using its own - (and currently limited and buggy) method directly against - the target codebase -- for latter use case please refer to - patch-fix-offsets below - Note: for expression format, see fix-offsets -h +fix-offsets: can either change offsets using limited expressions (DSL, + see fix-offsets -h) to specify the desired offset changes, + or using its own (and currently limited and buggy) method + directly against the target codebase (for latter use case + please refer to patch-fix-offsets below); + as a bonus, the through-away prefixes in paths within + a patch are (optionally, by default) normalized as per git + diff conventions patch-fix-offsets: - will try to apply, in a dry-run manner, the patch and based - on the patch utility feedback (hunk succeeded with offset X) - will produce an offset expression subsequently feeded into - fix-offsets tool + will try to apply, in a dry-run manner, the patch and based + on the patch utility feedback (hunk succeeded with offset X) + will produce an offset expression subsequently feeded into + fix-offsets tool (sort of a wrapper to bypass custom logic + in fix-offsets) -Notable tools (with a bit different intentions, though): +Notable related tools (with a bit different intentions, though): wiggle: http://neil.brown.name/wiggle/ -patchutils: https://git.fedorahosted.org/cgit/patchutils.git/ +patchutils: https://fedorahosted.org/patchutils/wiki +(used by gdp: https://gitorious.org/gdp) Quilt: http://savannah.nongnu.org/projects/quilt Please let me know if there are others handy (surely are!) or if there is -something better to solve use case with the as least effort (either manual -or computational like having the whole tree externalized on the filesystem) -as possible. +something better to solve the use case with as least effort (either manual +or computational like having the whole alternative tree externalized +on the filesystem) as possible. -- Jan |