On 2/6/20 4:27 PM, enh wrote: >> $ patch -p1 --dry-run -i 0001-chattr-fix-exit-status-redo-the-tests.patch >> checking file tests/chattr.test >> checking file toys/other/lsattr.c >> Hunk #1 succeeded at 343 with fuzz 1 (offset -16 lines). >> >> Ah, first line of last hunk is conflicting with the patch you poinged me >> about. :) > > yeah, sorry. too many things going on at once. (which is usually fine, > but it's awkward when they're in the same file.) > > speaking of this patch... did you forget to `git push` afterwards? i'm > seeing all the other patches, but this one with the test fixes is > still missing?
Oh I didn't apply it, I got distracted tracking down the bug in patch (I added fuzzy wrong: when a hunk is recognized with fuzz it applies the entire new hunk at the recognized spot, thus reverting the context lines it _didn't_ match), and then $DAYJOB happened. I'll try to get back to it today. >> And while figuring that out, I found out that toybox patch -x says success >> and >> toybox patch will apply the patch... reverting that first line to the old >> version out of the hunk. Sigh. That's a bug. > > ...possibly because you got distracted by this :-) Yup. Rob _______________________________________________ Toybox mailing list [email protected] http://lists.landley.net/listinfo.cgi/toybox-landley.net
