From owner-freebsd-current@freebsd.org Mon Jan 4 19:16:43 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C2BE4C3CC1 for ; Mon, 4 Jan 2021 19:16:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8ljl1HVrz3pPr for ; Mon, 4 Jan 2021 19:16:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2f.google.com with SMTP id l14so13541339qvh.2 for ; Mon, 04 Jan 2021 11:16:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UlvRwv+dx9VK1bZM8JfmvX+FpYiO4rLGrMWxtntHwPo=; b=MxPY6ClhJqUKbj0XD/36+9sgSc+bJ5R10X4fKrk2KUS++KoECC+mA05I3dIO8Q/T9j /WRFgFXu3dK0gckN+Q/n5510k3NRHjTHBNy5Y5XuJVdGQWqEJNxhARFUCkOur1wsFH2h s6BpEkVckfEiclDHvJHKdJqNKI+0v4cSDssuTwpHFZAIb1lWoXRBtQRo6VmNNGp+gnTR VNUEvq5pmpNgfXm38MZPis2s0ezOWgjuzmqQaqXUMeIcJq3U1ymCD1f9kqqjmYwm/Da4 5bIfBuGUQM1qyokjQ3WVx+GXyyx6meIc6GqjGxr13JF8buAB/pEJXVusJhIrH1tTLqtH nPgw== X-Gm-Message-State: AOAM5332c6gD/pehtwGTLnc591TUY2jYL0fluD5WZX6ySku5TebqDFXO Dr37rqo2ijgZ4mEaaY9IILdjStlYsXM2R2smdJMRRQ== X-Google-Smtp-Source: ABdhPJyMePMSxH8Cga7aBtu0kSyh83KpAUAmXU3ALTgRklhcuowzlUjqn7JjNoXfi7HOfLpMD2hRFY4F4P97YAgDl0Y= X-Received: by 2002:a05:6214:16cb:: with SMTP id d11mr77602307qvz.62.1609787801600; Mon, 04 Jan 2021 11:16:41 -0800 (PST) MIME-Version: 1.0 References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> In-Reply-To: From: Warner Losh Date: Mon, 4 Jan 2021 12:16:30 -0700 Message-ID: Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? To: Marek Zarychta Cc: Enji Cooper , FreeBSD Current , FreeBSD CURRENT X-Rspamd-Queue-Id: 4D8ljl1HVrz3pPr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 19:16:43 -0000 On Mon, Jan 4, 2021 at 12:13 PM Marek Zarychta < zarychtam@plan-b.pwste.edu.pl> wrote: > W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta < > zarychtam@plan-b.pwste.edu.pl> wrote: > > > > =E2=80=A6 > > > >> Terrible idea IMHO, but I am only the weak voice from the userbase. > >> > >> It's like deprecating old, well-worn hammer in the favour of the nail > >> gun. Why not deprecate biff(1), pom(6), nvi(1) etc.? > > > > Marek, > > I=E2=80=99m curious: have you used etcupdate before instead of > mergemaster? If so when? If you ran into issues (UX as well as functional= ): > could you please report them on bugs.freebsd.org > ? > > etcupdate is a less fragile tool that=E2=80=99s broken my systems= less > when compared with mergemaster. > > Dear Enji, > > to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times > over years. It works fine, but I don't like the idea of editing > conflicted files. > > I won't complain about etcupdate(8), but please leave mergemaster(8) > as is. I believe we need both: solid, fast black boxes driven it auto > mode and fragile tools in the base. mergemaser is rather not a potential > security hole in the system. > mergemaster is on its way out. Formalizing it by deprecating in 13 means you'll be able to use it through the end of life of the 13 branch many years from now. That's plenty of time to move to the new tools and/or develop enhancements that make them easier for you to use. The knock on communicating this well is a fair one, and we'll start taking measures to fix that. Warner