svn commit: r364806 - in head/sys/contrib/openzfs: include/os/freebsd/spl/sys module/os/freebsd/spl

John Baldwin jhb at FreeBSD.org
Wed Aug 26 17:33:12 UTC 2020


On 8/26/20 10:15 AM, Matthew Macy wrote:
> Do not commit directly to sys/contrib. PR, vendor branch update, then merge.

We do live in a world where source control is able to merge changes, and
it should be ok in that world to commit things directly while waiting for
the PR to be merged and letting the VCS figure it out on the next merge.
We haven't had a policy of never comitting directly to contrib/ since the
CVS days.  I do agree that changes should be pushed upstream to keep local
diffs as small as possible, but reasonable judgement should be applied
rather than a hard rule banning all commits.

> On Wed, Aug 26, 2020 at 12:29 AM Toomas Soome <tsoome at freebsd.org> wrote:
>>
>> Author: tsoome
>> Date: Wed Aug 26 07:29:17 2020
>> New Revision: 364806
>> URL: https://svnweb.freebsd.org/changeset/base/364806
>>
>> Log:
>>   remove pragma ident lines
>>
>>   The #pragma ident is historical relict and not needed any more, this
>>   pragma is actually unknown for common compilers and is only causing
>>   trouble.

-- 
John Baldwin


More information about the svn-src-head mailing list