From owner-freebsd-current@freebsd.org Mon Jan 4 19:47:56 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 DE9024C868B for ; Mon, 4 Jan 2021 19:47:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8mPm4Sh7z3tQD for ; Mon, 4 Jan 2021 19:47:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 961C44C8613; Mon, 4 Jan 2021 19:47:56 +0000 (UTC) Delivered-To: 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 95D204C868A; Mon, 4 Jan 2021 19:47:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (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 4D8mPm3X5nz3tXj; Mon, 4 Jan 2021 19:47:56 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x534.google.com with SMTP id z21so19729588pgj.4; Mon, 04 Jan 2021 11:47:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=b0bC70oDyja9MBOb1iTrn8+6S/xzInWZrSz1xEJzi6g=; b=NfJiQgaNIepaTHOZS5FBGyYv/eB1pZUsTo+Mh4ModTV/Oriz+wffusWmR/CCpVgGsf RUuFIeay2nkGnVWWOQFvg2SKOssx0FjzHrOR69p5gDqVPVmsqJr3rknsI3aGZ05qO2vJ 8Zg4SBuvXaotkRoxumErpoifLAPuZ3OQ+n/vM64tOLsN5ohr0hY1cTBtnd6ZLwNvm3KI mp1tu5I/eCtsktLVsLPhnMMF3u69R14/nwGxmUDbsKzxAkofuUaNwIQZ6DvmN/MUrkkj OESGyaq5JmcttDckuF9hT4oRI2CNRMa4DM7vksirRfgTiF1ShGwuF5fBhblEZ/oIK+T1 GsCg== X-Gm-Message-State: AOAM531R6APZzvF3ScI8JY8nMImCPsxBqgNO8hIjZswwEEyMO4TZa3Cv LFkgmmj7SD0JjbG+RBzZ3biKXu24iLhOrw== X-Google-Smtp-Source: ABdhPJxXV3mN36HeokmgOcHX/fz3aAKo51tYLXQo5+n/YwLbgTv17j6HAiMy2ibGrN+TLSM4SBBzFA== X-Received: by 2002:a63:4c06:: with SMTP id z6mr64410468pga.250.1609789674883; Mon, 04 Jan 2021 11:47:54 -0800 (PST) Received: from [192.168.20.29] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id 9sm41668434pfn.188.2021.01.04.11.47.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 11:47:54 -0800 (PST) From: Enji Cooper Message-Id: <57610DB3-A575-4851-AFBC-ABC362F89924@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Date: Mon, 4 Jan 2021 11:47:53 -0800 In-Reply-To: <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl> Cc: FreeBSD Current , FreeBSD CURRENT To: Marek Zarychta References: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D8mPm3X5nz3tXj 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:47:56 -0000 > On Jan 4, 2021, at 11:42 AM, Marek Zarychta = wrote: =E2=80=A6 > it's probably high time to stop escalating this thread. Some people = like > the way in which mergemaster copes with updates, some people like > etcupdate. With Git clean and smudge filters applied on local repo and > $FreeBSD$ IDs regenerated, mergemaster still works great and is more > ergonomic in use for at least two people. Hi Marek, I don=E2=80=99t take offense to your concerns. I=E2=80=99m just = trying to be direct and understand gaps there possibly are that can be = filled in in etcupdate(8). Your and others=E2=80=99 feedback is = appreciated. Thanks so much, -Enji PS While I admit that smudge filters are possible for managing diffs = with mergemaster (and I think it=E2=80=99s a novel solution =E2=80=94 = I=E2=80=99ve never heard of that before), not everyone should have to = set those up to use a core configuration tool. I find things like that = unfortunate gaps in the tooling that drives away users instead of = attracts them. I personally prefer focusing less on the nits and writing = bespoke code for system administration, so I can focus on things which = matter more to me in my life: people and nature.=