From owner-freebsd-current@freebsd.org Mon Jan 4 18:58:12 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 306B84C145E for ; Mon, 4 Jan 2021 18:58:12 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8lJM6b6rz3lH1 for ; Mon, 4 Jan 2021 18:58:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id E02F34C13BF; Mon, 4 Jan 2021 18:58:11 +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 DFDD44C125F; Mon, 4 Jan 2021 18:58:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (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 4D8lJM0qVcz3l7V; Mon, 4 Jan 2021 18:58:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf1-x42b.google.com with SMTP id w6so16973844pfu.1; Mon, 04 Jan 2021 10:58:10 -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=auPJAcYDn9P6MrWkFp/L6DaxqMJwzZtatJfceC0ABYw=; b=JG+Fe/Lqa0fiIXOSFZ9cSPNv/e7YwRxLLPq1dNulIuTv0WqzDMwCoTCpZYMcvNwxRz /lWuFUqYm7smJoPiqur+d1MBRWMFuS3IHawmU45/SAZ4flPGs5Q0kymfNeLkIxKT5meO Pmu52RdCFNiPUR85La9Fr3gSUjzozg87z/zAY19/gLvc4kHanXB1ymwqREtDVAk5g1dR xSi617lpJP9U87IkC+1v4iKwcpBGXwP5LQH7sW4zU4aghhul3Fx62yAeUX4a4N2zeWmK al+WPWJXJoxJ4db9b+V1GTTEjbL91aeTCazi492B/E1CT3l7Yn6EtDjJQGKZLQEnQxeT 3j3Q== X-Gm-Message-State: AOAM531BX5PGZSPwfLxTph6+mWIZcK5vIyweHAEWfcpn7EWVgHgYpXOc lZZebY3kgHeXE0Dab9M3AGcH/G7dNpjoog== X-Google-Smtp-Source: ABdhPJxodaLfCHo3GDBV5K6GuPsnfI2y2cGAKkDpnCabfq+ISoVbywqZOJvxMg6XLZQ1J7Zr4ZZr0g== X-Received: by 2002:a63:1d59:: with SMTP id d25mr71403160pgm.259.1609786689765; Mon, 04 Jan 2021 10:58:09 -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 j23sm42916219pgj.34.2021.01.04.10.58.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 10:58:09 -0800 (PST) From: Enji Cooper Message-Id: <15C691A6-1944-42EC-B64B-5873DFE2CB60@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 10:58:08 -0800 In-Reply-To: <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> Cc: Warner Losh , FreeBSD Current , FreeBSD CURRENT To: Marek Zarychta 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> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D8lJM0qVcz3l7V X-Spamd-Bar: - X-Spamd-Result: default: False [-1.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MV_CASE(0.50)[]; URI_COUNT_ODD(1.00)[3]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::42b:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[73.19.52.228:received]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::42b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42b:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[current,freebsd-current] 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 18:58:12 -0000 > On Jan 4, 2021, at 10:54 AM, Enji Cooper = wrote: >=20 >=20 >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta = > = wrote: >=20 > =E2=80=A6 >=20 >> Terrible idea IMHO, but I am only the weak voice from the userbase. >>=20 >> 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.? >=20 > 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. That reminds me, there is a feature gap (in the last 5~10 years I=E2=80=99= ve used etcupdate) that I forgot about between mergemaster and = etcupdate: in particular, mergemaster works when adding/removing new = users and groups from /etc/passwd* and /etc/group, respectively, dealing = with mtree files, the last time I checked. Apart from that, I don=E2=80=99= t see a use for mergemaster (and in which case, the feature gap can be = trimmed down/migrated to etcupdate). mergemaster has broken the = configuration of my machines/VMs more than etcupdate has ever and I=E2=80=99= ve used both tools for about the same time. Cheers, -Enji=