On Dec 23, 2012, at 1:42 PM, Garrett Cooper <[email protected]> wrote: > On Sun, Dec 23, 2012 at 11:55 AM, Jason Evans <[email protected]> wrote: >> On Dec 2, 2012, at 5:55 PM, Garrett Cooper <[email protected]> wrote: >>> The attached patches make jemalloc(3) function [better] on FreeBSD. >>> >>> Garrett Cooper (3): >>> Don't mangle errno with free(3) if utrace(2) fails >>> Improve configure tests for ffsl >>> Fix build break on *BSD >>> >>> configure.ac | 7 +++++-- >>> include/jemalloc/internal/jemalloc_internal.h.in | 6 +++++- >>> include/jemalloc/jemalloc_defs.h.in | 5 +++++ >>> src/jemalloc.c | 2 ++ >>> 4 files changed, 17 insertions(+), 3 deletions(-) > > ... > >> These patches don't apply when I attempt to use 'git am' (which is >> particularly unhelpful when errors occur). Is there some workflow for >> integrating these patches that is supposed to work? > > Strange. There shouldn't be... Let me update my git repo and > regenerate the patches. > > What was the error that you ran into when you tried to apply them?
$ git am ~/Desktop/PATCH1.eml Applying: Don't mangle errno with free(3) if utrace(2) fails error: patch failed: src/jemalloc.c:83 error: src/jemalloc.c: patch does not apply Patch failed at 0001 Don't mangle errno with free(3) if utrace(2) fails When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". I finally figured out what the actual problem is: there's an extra whitespace character in front of each unchanged contextual line in the diffs. Thanks, Jason _______________________________________________ jemalloc-discuss mailing list [email protected] http://www.canonware.com/mailman/listinfo/jemalloc-discuss
