summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2013-10-10 20:29:18 +0200
committerJan Pokorný <jpokorny@redhat.com>2013-10-10 20:29:18 +0200
commit607c64abf5df97e60bec1ab21908a62f5836c3ed (patch)
tree2df4c56389922c5eadc42323c75036cc2f0976d8
parent066c4bfa18698ec40b79a90e6e5b8b69b6e1811e (diff)
downloadpatch-fix-offsets-607c64abf5df97e60bec1ab21908a62f5836c3ed.zip
patch-fix-offsets-607c64abf5df97e60bec1ab21908a62f5836c3ed.tar.gz
patch-fix-offsets-607c64abf5df97e60bec1ab21908a62f5836c3ed.tar.xz
Refresh and update README
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--README34
1 files changed, 19 insertions, 15 deletions
diff --git a/README b/README
index 49dfaac..9878907 100644
--- a/README
+++ b/README
@@ -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