From owner-freebsd-current@freebsd.org Mon Jan 4 18:39:21 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 EBDE94DFC70 for ; Mon, 4 Jan 2021 18:39:21 +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 4D8ktd2GDvz3hZV for ; Mon, 4 Jan 2021 18:39:21 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 4BEAA4DFC6E; Mon, 4 Jan 2021 18:39:21 +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 4BAF04DFC6D for ; Mon, 4 Jan 2021 18:39:21 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) (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 4D8ktd1Q90z3hVB for ; Mon, 4 Jan 2021 18:39:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x533.google.com with SMTP id n10so19599752pgl.10 for ; Mon, 04 Jan 2021 10:39:20 -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:content-transfer-encoding:mime-version :subject:date:references:to:in-reply-to:message-id; bh=72RoLHwolsG3p4dunrqhPxK7QoqPqY8vihwDu7BPlhU=; b=ZxcSVtDm1xExHZCxxHtutu7E6WUUsnjdD8CWgsOOa3G8Ahv4YKG8KT/SxeUPZhomfW LcQkbmvdNMJ+hMzV9ZFEgAmYRx5vTMLrvPWcI1RcCzcEwWY3IKUEkwX1WFynvcX7VyRo FbHQzox+NUSkoSdjjzo8CX/D1hysMjbx0iyY336+Wla0NHBNHEuM+naSJ21e7KiMtHIp du6cKIJiRDI5yIuXI96/AueiCl/IFoW273U/FxkBfkdYTFr6cl3fOyC7C3GYsQGL5yIq gC0Pu0yJg3rlhV3p2K1h7ku0Tgn0ockC2ULrYQ+/GKVuBu42MXw6W6oV/qcnCLsV38+b iWvw== X-Gm-Message-State: AOAM532ZWLay09BASv0NhWDUaaCLHCO5g4eNIwQR5DRfzTF6+3ctv1Wj jkEDcro/rg1Bow41St3+T1vTCRsZtZCehA== X-Google-Smtp-Source: ABdhPJwGLm/nO8PHCV0T3yq6M5mrRv/Ue0dAlv95/Jss3OOvi30PP/QltvIpp2MwVjgu/N/CC5hPFg== X-Received: by 2002:a62:8fd1:0:b029:19e:757b:c7ba with SMTP id n200-20020a628fd10000b029019e757bc7bamr66277497pfd.44.1609785559475; Mon, 04 Jan 2021 10:39:19 -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 nk11sm87677pjb.26.2021.01.04.10.39.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 10:39:19 -0800 (PST) From: Enji Cooper Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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:39:18 -0800 References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> To: FreeBSD Current In-Reply-To: Message-Id: <1C7B83B8-60A1-473D-8791-0A03AFEA1405@gmail.com> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D8ktd1Q90z3hVB 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 18:39:22 -0000 > On Jan 4, 2021, at 10:33 AM, David Wolfskill = 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=