Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jan 2021 10:39:18 -0800
From:      Enji Cooper <yaneurabeya@gmail.com>
To:        FreeBSD Current <current@freebsd.org>
Subject:   Re: CURRENT, usr/src on git, howto "mergemaster"?
Message-ID:  <1C7B83B8-60A1-473D-8791-0A03AFEA1405@gmail.com>
In-Reply-To: <X/NfZNGmAN/lTPCB@albert.catwhisker.org>
References:  <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <X/NfZNGmAN/lTPCB@albert.catwhisker.org>

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

> On Jan 4, 2021, at 10:33 AM, David Wolfskill <david@catwhisker.org> =
wrote:
>=20
> On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote:
>> ...=20
>> Adding to this: it has no maintainer, it=E2=80=99s less featureful, =
and it lacks tests. Once I switched to etcupdate a few years back I =
never looked back at mergemaster.
>>=20
>> I honestly think it should be deprecated in 13.x and removed in 14.x. =
It=E2=80=99s been several major releases since it=E2=80=99s been =
unofficially deprecated.
>>=20
>> -Enji
>> ....
>=20
> All of which is fine, but at some point prior to that, perhaps
> src/UPDATING's instructions that cite its use might merit a change to
> reflect the use of a supported tool?

I=E2=80=99ll submit a patch soon on Phabricator to do this (might as =
well test out the new git workflow on my end=E2=80=A6).
Cheers,
-Enji=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1C7B83B8-60A1-473D-8791-0A03AFEA1405>