From owner-freebsd-current@freebsd.org Mon Jan 4 19:47:32 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 2DAD34C8446 for ; Mon, 4 Jan 2021 19:47:32 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) (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 4D8mPH36fgz3tVH for ; Mon, 4 Jan 2021 19:47:31 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: by mail-wr1-x42a.google.com with SMTP id y17so33339747wrr.10 for ; Mon, 04 Jan 2021 11:47:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:reply-to:subject:to:references :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=J94WE4V05ksBHTXFMlIOJnkG561L3fDOidxsVL6+r3Q=; b=IcNCDDr92leUGg+QDCL+seHCDs3r2+vqoE35bWT4EuVl12ggo6vOOdyskhdz14DZ9a AHrQja+k2lidKwRm5xQpVkBIxNKxY2LCd7ig3ClN19HECZRoxZtLK+bEW/+Qd1og1ByV eF3alzd9w3rYxKNFj79TS0KQpXyAms+R7THPSL/5t+zpTKNIg6OtNafPoozoT2tKs5QY rh4yx58DcEFQcCa4pzBzxHUd+4UdHGBUR/GJ3qADwwWpNmXb2saDou+LSpMKPF6y+MSf fcd1AD5nVbBfqHMoqC0/XLbZHIUXDman5EBDH6pG5EyaXTdikM5VvbHmAhvFj3Hnybx/ 7obw== X-Gm-Message-State: AOAM530x5eq7r4cBdgpiX7LsbvE6KlqUZUL3IkYC9KFqVzGCBrEKqVn7 2mR6K0re60qqleFuUdHgoCeocdKT2L80Jg== X-Google-Smtp-Source: ABdhPJw7pHZlbDM6l4xjWTFeuePK+AulUc0uxWzASi9CYNq8nrhADQJ4sP6lRsL89MHyGCERDsRUKg== X-Received: by 2002:adf:dd90:: with SMTP id x16mr79697736wrl.85.1609789648808; Mon, 04 Jan 2021 11:47:28 -0800 (PST) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id w189sm651008wmg.31.2021.01.04.11.47.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Jan 2021 11:47:28 -0800 (PST) Sender: Michal Meloun From: Michal Meloun X-Google-Original-From: Michal Meloun Reply-To: mmel@freebsd.org Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? To: freebsd-current@freebsd.org References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> Message-ID: Date: Mon, 4 Jan 2021 20:47:28 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210104185914.GA19556@troutmask.apl.washington.edu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D8mPH36fgz3tVH X-Spamd-Bar: - X-Spamd-Result: default: False [-2.00 / 15.00]; HAS_REPLYTO(0.00)[mmel@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-0.999]; 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::42a:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::42a:from:127.0.2.255]; MID_RHS_MATCH_TO(1.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42a: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:47:32 -0000 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’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) > 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 3) implemeted Michal