Date: Mon, 25 Feb 2013 07:21:30 -0700 From: Warner Losh <imp@bsdimp.com> To: Christoph Mallon <christoph.mallon@gmx.de> Cc: freebsd-arch@FreeBSD.org Subject: Re: Large Capsicum patch for review. Message-ID: <61FF31A0-7051-4FAE-8399-76585B1D5018@bsdimp.com> In-Reply-To: <512B3E5C.2090506@gmx.de> References: <20130213025547.GA2025@garage.freebsd.pl> <20130213230221.GB1375@garage.freebsd.pl> <20130223221116.GR1377@garage.freebsd.pl> <5129ADC5.5040306@gmx.de> <20130224193058.GW1377@garage.freebsd.pl> <512B3E5C.2090506@gmx.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Feb 25, 2013, at 3:35 AM, Christoph Mallon wrote: > On 24.02.2013 20:30, Pawel Jakub Dawidek wrote: >> On Sun, Feb 24, 2013 at 07:05:57AM +0100, Christoph Mallon wrote: >>> On 23.02.2013 23:11, Pawel Jakub Dawidek wrote: >>>> On Thu, Feb 14, 2013 at 12:02:22AM +0100, Pawel Jakub Dawidek = wrote: >>>>> I'd like to commit this patch: >>>>>=20 >>>>> http://people.freebsd.org/~pjd/patches/capkern.diff >>>>=20 >>>> The patch was updated after the following changes and is available = at >>>> the link above: >>>=20 >>> I was not able to apply this patch cleanly and had to fudge with the = diff: >>> - Two diff headers (contrib/openbsm/etc/audit_event and = lib/libc/gen/Makefile.inc) have an extra space after --- and +++, which = is recognized as part of the filename. >>> Was this patch manually altered? >>=20 >> Nope, but I'm using some script to generate patch(1)-compatbile diff >> from a perforce diff. >=20 > Ugh, why is p4 still in use, if it is just a hassle and hides history? Because it is the only VCS that doesn't suck at merging? While git, hg = and svn do a passing fair job, they all suck compared to perforce. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?61FF31A0-7051-4FAE-8399-76585B1D5018>