From owner-freebsd-current@freebsd.org Mon Jan 4 19:59:23 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 D6A724C8B6F for ; Mon, 4 Jan 2021 19:59:23 +0000 (UTC) (envelope-from driesm.michiels@gmail.com) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 4D8mfz1Rxmz3vn4; Mon, 4 Jan 2021 19:59:22 +0000 (UTC) (envelope-from driesm.michiels@gmail.com) Received: by mail-ed1-x530.google.com with SMTP id dk8so28699233edb.1; Mon, 04 Jan 2021 11:59:22 -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:to:references:in-reply-to:subject:date :message-id:mime-version:content-transfer-encoding:content-language :thread-index; bh=mVeLEveHjajTNCFyufNpl/Fw3C1x7iEIDfUpSR3tl54=; b=OdCBTtr5qIVncBQQdAFpmXczxFhWdfJW6+r6pYjFPIpgS9LjlVvvyToHK5qlNYPzx7 6PoGCVt59i88/ucF/V9oKPmKX/Sk9Iw4qRptNNH0DMHxzzLsDSDrG5epIJDbt6jtwKWF 3dvSJQmQ14JaGtWrV0VFZ9GrWT3EJSRH9SZmWXwM3eqob7zk7aqstfb7tQr2lvNT2dLw rgwCOt4lSDbUQCd4dgSwjVM3W/guum3wGzFnILhirLJZkbeFd0nXOdeqT8gpnpO6tt06 Z0bAwE4U1ltAq/x0xhZVbq2EIcWEff1CTfAfDdNjl57oevHUHl2ghqQjZU5zLEjlGniz Izcg== X-Gm-Message-State: AOAM533Pe5l+P6TIbPzIApazssy9JbvA6DTqlx0qgcrYwX4mk9hqp3BG TMrNTUWS6Ah3XOTum52xwy0ErBsiQlaoRaaR X-Google-Smtp-Source: ABdhPJxlCg068QS27yWQqy7g6S29Bqo7Zsh6PQHrrl0OLBWGZTPcspPP4K5kqKHCtAMXTdBg0CvAbg== X-Received: by 2002:a50:eb96:: with SMTP id y22mr73640436edr.91.1609790361522; Mon, 04 Jan 2021 11:59:21 -0800 (PST) Received: from DRIESPC (ptr-8sijbm7h33au6aqhm11.18120a2.ip6.access.telenet.be. [2a02:1811:2505:1601:adc8:5d36:b9d:2bc5]) by smtp.gmail.com with ESMTPSA id j20sm23879845ejy.124.2021.01.04.11.59.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2021 11:59:20 -0800 (PST) From: To: , References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> In-Reply-To: Subject: RE: CURRENT, usr/src on git, howto "mergemaster"? Date: Mon, 4 Jan 2021 20:59:21 +0100 Message-ID: <00b001d6e2d4$18457e80$48d07b80$@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 16.0 Content-Language: en-be Thread-Index: AQIYVzbYUzhgWoJ2ShosMx3N3CDnrQEBrjpLAp4jheMBaTYyZqlsrv/Q X-Rspamd-Queue-Id: 4D8mfz1Rxmz3vn4 X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; 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:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::530:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::530:from:127.0.2.255]; FROM_NO_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::530:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] 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:59:23 -0000 > -----Original Message----- > From: owner-freebsd-current@freebsd.org current@freebsd.org> On Behalf Of Michal Meloun > Sent: Monday, 4 January 2021 20:47 > To: freebsd-current@freebsd.org > Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? >=20 >=20 >=20 > On 04.01.2021 19:59, Steve Kargl wrote: > > 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=E2=80=99s 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=E2=80=99s > been several major releases since it=E2=80=99s 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) > > >=20 > Moreover mergemaster is still officially documented and recommend as = only > right method in FreeBSD handbook. See > https://www.freebsd.org/doc/handbook/makeworld.html. > World is moving, we may have new tools but each deprecation should be, = in > this order: > 1) well announced > 2) adjusted in the handbook https://reviews.freebsd.org/D27848 I'm happy to change the UPDATING entry in /usr/src/UPDATING aswell if = Enji doesn't beat me to it. Once I jumped ship to etcupdate I never looked back. Its the better tool = and hasn't broken my /etc/master.passwd since. Dries > 3) implemeted >=20 > Michal >=20 >=20 >=20 >=20 >=20 > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to = "freebsd-current-unsubscribe@freebsd.org"