From owner-freebsd-current@freebsd.org Mon Jan 4 18:59:22 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 20DD54C1660; Mon, 4 Jan 2021 18:59:22 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8lKj5NsCz3lY3; Mon, 4 Jan 2021 18:59:21 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.16.1/8.16.1) with ESMTPS id 104IxElW019825 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Jan 2021 10:59:14 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.16.1/8.16.1/Submit) id 104IxEIS019824; Mon, 4 Jan 2021 10:59:14 -0800 (PST) (envelope-from sgk) Date: Mon, 4 Jan 2021 10:59:14 -0800 From: Steve Kargl To: Enji Cooper Cc: Warner Losh , Marek Zarychta , FreeBSD Current , FreeBSD CURRENT Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <20210104185914.GA19556@troutmask.apl.washington.edu> References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> X-Rspamd-Queue-Id: 4D8lKj5NsCz3lY3 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:59:22 -0000 On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> 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. > > Adding to this: it has no maintainer, it’s less featureful, and it lacks tests. Once I switched to etcupdate a few years back I never looked back at mergemaster. > > I honestly think it should be deprecated in 13.x and removed in 14.x. It’s been several major releases since it’s been unofficially deprecated. > > -Enji > 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. % 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] % svn log -r 262619 ------------------------------------------------------------------------ r262619 | jmg | 2014-02-28 11:51:47 -0800 (Fri, 28 Feb 2014) | 3 lines 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... ------------------------------------------------------------------------ etcupdate first appeared in the tree on 2012-07-13 (r238423) -- Steve