OK; On further revision ... On 26.07.2013 20:01, Jan Beich wrote: > 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 The change came from OpenBSD, which took it from DragonFlyBSD: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/patch/patch.c.diff?r1=1.49;r2=1.50 It was merged as part of some OpenBSD syncing in patch.c http://svnweb.freebsd.org/base?view=revision&revision=246091 Cheers, Pedro.Received on Sat Jul 27 2013 - 13:08:26 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:39 UTC