From owner-freebsd-current@freebsd.org Mon Jan 4 19:25:57 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 8FF654C4A33; Mon, 4 Jan 2021 19:25:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (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 4D8lwP3J93z3qCk; Mon, 4 Jan 2021 19:25:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pj1-x102c.google.com with SMTP id l23so211465pjg.1; Mon, 04 Jan 2021 11:25:57 -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=CF4W2K/1aP9u7HN4GiwAXBqOki1Q3mGoxIBrMNUMPEA=; b=MisOvuMlD21zYzD6EzHJTj941b5097idsit/FgApi5UDFd/IeCtBb2LcCzI9v95+YO VgHNotqFi0JUF2d42CBav3Pr4PEKRzfjrpcIxe51rEpmK/CFcI/RlhE2yYR6TtWrAhSV iXDxIjTvx5AdoG9enYj9gC3VCwatyD0/T0StfPNltlZ/JaUxKYE4q5ELSRU9P//NCInl Z8O9sRBlQUJ6/tw7VibwRSJ88FNiD3wUeRtmKbE22n3fOPIqGlrBFlvZNtm4NWswyInP Qd4i8cKmB7YkAas+jmLgOLqCd7vGJtz3TaMbbZpgLdhAcrIsB7v2AfB6u1AKJ0Ng2EvN K9gA== X-Gm-Message-State: AOAM533jWMrWShAVVmLP14w4oGM34l87Ni9PCFKOKqFgppbx99nlyDm3 izgGft+HfT3m5Q0xhYa6pw21XFhhJskwtg== X-Google-Smtp-Source: ABdhPJzUAs4cIPmRuKIXTvRJxgAgVimE35Bpm49oS/ORC7OI50dSJteHOPkLqlpbVbijlAF7MHtWTA== X-Received: by 2002:a17:902:8687:b029:dc:2a2c:e99b with SMTP id g7-20020a1709028687b02900dc2a2ce99bmr73295969plo.37.1609788355248; Mon, 04 Jan 2021 11:25:55 -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 a13sm56299542pfr.59.2021.01.04.11.25.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 11:25:54 -0800 (PST) From: Enji Cooper Message-Id: <3101A583-D3BF-452B-BBAC-389EB344CD7D@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:25:53 -0800 In-Reply-To: <20210104185914.GA19556@troutmask.apl.washington.edu> Cc: Warner Losh , Marek Zarychta , FreeBSD Current , FreeBSD CURRENT To: Steve Kargl References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D8lwP3J93z3qCk 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:25:57 -0000 > On Jan 4, 2021, at 10:59 AM, Steve Kargl = wrote: >=20 > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >>=20 >>> On Jan 4, 2021, at 10:19, Warner Losh wrote: >>>=20 >>> mergemaster has been on its way out since well before the switch to = git. >>> It's been disfavored for at least a decade and basically = unmaintained in >>> the base for maybe last 5 years. Apart from major breakage, only doc >>> changes have happened in that time. >>=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 > For something that has been disfavored for a decade, unmaintained > for at least 5 years, and now seemly unofficially deprecated, it > seems strange that /usr/src/UPDATING does not mention etcupdate > in the COMMON ITEMS section. >=20 > % svn info UPDATING | grep -i vision > Revision: 367909 > % svn blame UPDATING > ... > 64477 imp To rebuild everything and install it on the current = system. > 64477 imp = ----------------------------------------------------------- > ... > 262619 jmg mergemaster -Fp [5] > 262619 jmg mergemaster -Fi [4] >=20 > % svn log -r 262619 > = ------------------------------------------------------------------------ > r262619 | jmg | 2014-02-28 11:51:47 -0800 (Fri, 28 Feb 2014) | 3 lines >=20 > since -F is safe, and an update from 10-HEAD to 10-STABLE is sooo = bloody > anoying w/o it.. recommend people use -F too... > = ------------------------------------------------------------------------ >=20 > etcupdate first appeared in the tree on 2012-07-13 (r238423) As noted elsewhere in the thread: I=E2=80=99m working on it. = Here=E2=80=99s an official bug for tracking the work (in base): = https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252417 = . I=E2=80=99l= l fill it in some more throughout the day (need to context switch back = to $dayjob). Thanks :)! -Enji