From owner-freebsd-current@freebsd.org Mon Jan 4 19:27:51 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 DCE204C591C; Mon, 4 Jan 2021 19:27:51 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (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 4D8lyb470qz3qtZ; Mon, 4 Jan 2021 19:27:51 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf1-x42c.google.com with SMTP id s21so16981647pfu.13; Mon, 04 Jan 2021 11:27:51 -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:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=+H5h4fA9W3PviPZrw9UIobJ2CPU1LLA3MED6bzLzO+k=; b=XRunWxziXrzEk78esCEgVNl1lwP0vMneaLES7xwR5kAxRcyYoPrkUhA8ynYLxnUgmo EJBlIBUuVahN0gpFUAupZP5xAcySm+rhHxX7g1AgiuFwPFPOnTP9Ff+7d41sGryV71Se vIa+ypEqiGuiAck+LVNHxKw4waAFxIJkVg0TUqEg4a8TDIAV/lF9w4XMBclVQlvFYCje 1vZju8brvj/HROgBzuX/ldpLuHWaueFPyozqs4Ir7eLYvm/v6FVWijUiOIR+aza5BhCM GgOoVbUv4t4zVn6sMLI30dB8fS3xPVT6Y/8RSBKFBn5mitRccYSt5n1xgqCZysQpfqs0 De9g== X-Gm-Message-State: AOAM531Xv3yHFDPwSuDErD3SDzVV3XL7JOYRGB+FLRduJvnsiQjxnjOf SkPBhiI4F9GXy3s+eLem9MZ6dXvjvZoydg== X-Google-Smtp-Source: ABdhPJyZPmk4qnolsZ5IP1akx+/TGbpEP4x8nsw3BA8stOuGGDRZwgPtaxkj285yKQx4UXOJqb0tpA== X-Received: by 2002:a65:5209:: with SMTP id o9mr29786699pgp.34.1609788470408; Mon, 04 Jan 2021 11:27:50 -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 19sm55244583pfn.133.2021.01.04.11.27.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 11:27:49 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? From: Enji Cooper In-Reply-To: Date: Mon, 4 Jan 2021 11:27:48 -0800 Cc: Marek Zarychta , FreeBSD Current , FreeBSD CURRENT Content-Transfer-Encoding: quoted-printable Message-Id: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> References: To: Jeffrey Bouquet X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D8lyb470qz3qtZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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:27:52 -0000 > On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet = wrote: =E2=80=A6 >> Dear Enji, >>=20 >> 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. >>=20 >> 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. Hi Jeffrey and Marek, Could you please be more specific in your concerns? I don=E2=80=99= t mind helping resolve them, but unfortunately the concerns noted above = are a bit nebulous. Thank you! -Enji=