Date: Sat, 27 Jul 2013 01:01:21 +0000 From: Jan Beich <jbeich@tormail.org> To: Pedro Giffuni <pfg@FreeBSD.org> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: [Heads up] BSD-licensed patch becoming the default RSN. Message-ID: <1V2ssp-000Nrk-Q8@internal.tormail.org> In-Reply-To: <51F2E627.9090907@FreeBSD.org> (Pedro Giffuni's message of "Fri, 26 Jul 2013 16:12:07 -0500") References: <51F2E627.9090907@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
bsdpatch doesn't list files of the failed hunks with -C and -s option. This may be less convenient if you edit a patch directly rather than regen it after polluting the tree. $ patch -CEfsp0 -i /path/to/varsym.diff 1 out of 1 hunks failed 1 out of 2 hunks failed 2 out of 2 hunks failed 1 out of 5 hunks failed 1 out of 1 hunks failed 1 out of 1 hunks failed 1 out of 1 hunks failed zsh: exit 1 $ gnupatch -CEfsp0 -i /path/to/varsym.diff 1 out of 1 hunks failed--saving rejects to contrib/openbsm/etc/audit_event.rej 1 out of 2 hunks failed--saving rejects to lib/libc/sys/Makefile.inc.rej 2 out of 2 hunks failed--saving rejects to sys/security/audit/audit_private.h.rej 1 out of 5 hunks failed--saving rejects to sys/security/audit/audit.h.rej 1 out of 1 hunks failed--saving rejects to sys/bsm/audit_kevents.h.rej 1 out of 1 hunks failed--saving rejects to sys/kern/syscalls.master.rej 1 out of 1 hunks failed--saving rejects to sys/sys/priv.h.rej zsh: exit 8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1V2ssp-000Nrk-Q8>