From owner-freebsd-current@freebsd.org Mon Jan 4 18:30:31 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 7AFF74DF4CF; Mon, 4 Jan 2021 18:30:31 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (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 4D8khR2sqxz3R4D; Mon, 4 Jan 2021 18:30:31 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x633.google.com with SMTP id e2so14967198plt.12; Mon, 04 Jan 2021 10:30: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:content-transfer-encoding:from:mime-version :subject:date:message-id:references:cc:in-reply-to:to; bh=KETMF7D9+yvThJEzwoONG3U0Vud5xMoM25qa7uByKgI=; b=kqiqHnuvZe+auPdGu1pYKqs02WAN1QaLK7m7BraaT2B1Xb37Q5zV4i/ieDwYVwVpXN 6W2TsWuDXp84fnrBZ4BpmYSxibc75PxCpAy0yisHn+wXzNG5QTzGCO7iMdGD74md7Tj7 G7+q92lF131uZHSXzAjmJnC00w8xGP6Ptsi+nAoqQmqaRUZPxLXC5ND+7SyalIegp4ip 8OvvJFIFfsHYzmQNB5PKgGE6XJfUhE7WcU3Buz+bdXX8+exqunUIgajOiBZBjIhHLkBY bryZLRHiBAntjbRoW9e8gN96kE1x7smQ4bJJ/IZlUk7R7C+QcaTdzBc89xu7/PL2iWtF eSYg== X-Gm-Message-State: AOAM533ZgBN3npy0QHpaHnBFvP38UYSRcpLWlYH6yE51DgHcOB1F9co5 +IdxBbWfhwOa1hKUEXB/8ME= X-Google-Smtp-Source: ABdhPJyq9CdcOghi1lBWaeQWI9w5uTY/HsSTqNUm1X85jhQt7TsrS2W0YAXXjaqF+VOy5JSKZBC+bw== X-Received: by 2002:a17:902:b693:b029:da:e92c:fc23 with SMTP id c19-20020a170902b693b02900dae92cfc23mr51771973pls.55.1609785029961; Mon, 04 Jan 2021 10:30:29 -0800 (PST) Received: from [192.168.20.31] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id u25sm53594593pfn.101.2021.01.04.10.30.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Jan 2021 10:30:29 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Enji Cooper Mime-Version: 1.0 (1.0) Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Date: Mon, 4 Jan 2021 10:30:28 -0800 Message-Id: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> References: Cc: Marek Zarychta , FreeBSD Current , FreeBSD CURRENT In-Reply-To: To: Warner Losh X-Mailer: iPhone Mail (18B92) X-Rspamd-Queue-Id: 4D8khR2sqxz3R4D 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:30:31 -0000 > On Jan 4, 2021, at 10:19, Warner Losh wrote: >=20 > =EF=BB=BFOn Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta > wrote: >=20 >> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >>=20 >>> etcupdate does a full three merge, while mergemaster fakes it in a numbe= r >>> of ways. etcupdate directly keeps track of the resolutions, which is why= >>> $FreeBSD$ doesn't matter so much to it. >>>=20 >>> mergemaster is deprecated and will likely be removed from the system >>> because it has no maintainer and is quite a bit harder to keep working >> than >>> etcupdate. >>>=20 >>=20 >> Please don't sacrifice mergemaster(8) for the successful transition to >> Git. The amount of feedback on the mailing list should give the core@ >> some idea of how widely mergemasted is still deployed. Some people just >> like to merge files side by side with pressing keys. Why innocent >> mergemaster(8) has to be a victim of switching to Git? Sacrifice please >> svnlite(1) - it became completely useless for HEAD and upcoming stable >> branches. >>=20 >=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. Adding to this: it has no maintainer, it=E2=80=99s less featureful, and it l= acks tests. Once I switched to etcupdate a few years back I never looked bac= k 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 deprec= ated. -Enji=