Messages in this thread | | | From | "Albert D. Cahalan" <> | Subject | Re: Htree directory index for Ext2, updated | Date | Fri, 17 May 2002 00:22:04 -0400 (EDT) |
| |
> After learning to my horror that gnu patch will, if a patch was made to be > applied with option -p0, sometimes apply patches to your 'clean' tree (the > one with the ---'s) instead of the target tree (the one with the +++'s) I > decided to switch to -p1, and that is how this patch is to be applied.
The worst thing is that gnu patch will make this decision on a per-file basis, so you can't then back out the changes with -R.
Do like this:
diff -Naurd old new
IMPORTANT: the directory names should have the same number of characters in them. Do not try something like:
diff -Naurd bad idea diff -Naurd doomed 2fail
Don't use "linux" for a name. Don't use anything Linus might use. Pick your own equal-length directory names, and don't distribute tarballs containing them. This prevents source-destroying disasters.
Then to apply:
(cd my-linux && bzip2 -dc ../foo.bz2 | patch -p1 -s -E)
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |