Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Feb 2019 08:28:30 -0800
From:      Enji Cooper <yaneurabeya@gmail.com>
To:        Kyle Evans <kevans@freebsd.org>
Cc:        "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   Re: svn commit: r344414 - stable/11
Message-ID:  <6A8C488C-05F4-4607-8F40-F301AF91E7EA@gmail.com>
In-Reply-To: <CACNAnaFwj8Kj6g7Gt=%2BcoRCdfTggLbwS9thS376QgchEWBVTwQ@mail.gmail.com>
References:  <201902210322.x1L3MKeV007120@repo.freebsd.org> <201902210616.x1L6G7SV018721@pdx.rh.CN85.dnsmgr.net> <CACNAnaFwj8Kj6g7Gt=%2BcoRCdfTggLbwS9thS376QgchEWBVTwQ@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

> On Feb 21, 2019, at 04:43, Kyle Evans <kevans@freebsd.org> wrote:
>=20
> On Thu, Feb 21, 2019 at 12:16 AM Rodney W. Grimes
> <freebsd@pdx.rh.cn85.dnsmgr.net> wrote:
>>=20
>>> Author: kevans
>>> Date: Thu Feb 21 03:22:20 2019
>>> New Revision: 344414
>>> URL: https://svnweb.freebsd.org/changeset/base/344414
>>>=20
>>> Log:
>>>  MFC (RECORD ONLY) r338050: Loader default interpreter flip
>>>=20
>>>  The default interpreter for stable/11 is 4th; this will never and can n=
ever
>>>  change. Record MFC of r338050 to proactively prevent any accidents in f=
uture
>>>  batching of MFCs.
>>>=20
>>> Modified:
>>> Directory Properties:
>>>  stable/11/   (props changed)
>>=20
>> Does it make sense to do a direct commit to stable/11
>> marking the line that does this flip with a
>> "Do not change this in the stable/11 branch"
>> so that someone does not try to manually merge
>> the change if they happen to notice the code
>> is different?
>=20
> I'll chew on it for a little bit. It's fairly clear what the
> ramifications of swapping those lines around are, even from diff
> review, and I'd like to assume no one would willfully do it if they
> put a couple seconds thought into what they were about to commit.

Kyle,
    I think what you did makes sense. I=E2=80=99ve done this and I=E2=80=99v=
e seen others do similar in the past.=20
    As someone who=E2=80=99s merged code in from others, I appreciate measur=
es like this, which would prevent me from breaking a stable branch by accide=
nt.
Thanks!
-Enji=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6A8C488C-05F4-4607-8F40-F301AF91E7EA>