From owner-freebsd-current@freebsd.org Mon Jan 4 18:18:43 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 08B284DF313 for ; Mon, 4 Jan 2021 18:18:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4D8kQp6fl9z3QBD for ; Mon, 4 Jan 2021 18:18:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id g24so19085863qtq.12 for ; Mon, 04 Jan 2021 10:18:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dB1AYL/uzqA8kZ9rwZttbAcp/IYcmuOEDzqMz2dtgoU=; b=Un6JKXypADlypFy675nJMcROxwFIKsdHqDbBWPIf1jgcrGbH5o2n+ZnXX0PSicjFNU eVySO5lFpEqObyCMdDVyx5a7edd+N2cxZ6xl9iqwhkuz115Cuqpl9cMqdzKVVv+bJSfk TMrHNnjvr5WO2LlLVnrOd+SGIVZK4Zf1pgDAhcOCd6HMp/eX1UKrcXgU/WEiwpMJ79hC kOjxMB3vBQvSq7MASGvOImmMIwg8By8oFelCz00Lip/u7he1ISeRIyqZDrYA/0KENA0p Q49v24RungBDNNMMHeaiqk3/b0HoAI1U1DIlkfcMImnRoHtkmpiEutUkg4PSkm1sEkn4 1aDQ== X-Gm-Message-State: AOAM533lS0EnXBaVe1bfPedjMVc5tUdUg4modmg0UiSuzKGM7YHNkv/v coNXbxblk2LQ4tWthFMVbvXtmmOUrsAk8m7t6CnRP9xP+UfJ6A== X-Google-Smtp-Source: ABdhPJygAl4BQvFeAXEyhEJZ5cA5dT7M6lumHKhEZQEJbQBTlGSgwFvroWLHLQ9dVohdG7J0QZu5XBj058sbmQAIAr4= X-Received: by 2002:ac8:4910:: with SMTP id e16mr73197480qtq.244.1609784322059; Mon, 04 Jan 2021 10:18:42 -0800 (PST) MIME-Version: 1.0 References: <20210104123512.0f5e1b01@hermann.fritz.box> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> In-Reply-To: <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> From: Warner Losh Date: Mon, 4 Jan 2021 11:18:31 -0700 Message-ID: Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? To: Marek Zarychta Cc: FreeBSD Current , FreeBSD CURRENT X-Rspamd-Queue-Id: 4D8kQp6fl9z3QBD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" 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 18:18:43 -0000 On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta wrote: > W dniu 04.01.2021 o 17:14, Warner Losh pisze: > > > etcupdate does a full three merge, while mergemaster fakes it in a number > > of ways. etcupdate directly keeps track of the resolutions, which is why > > $FreeBSD$ doesn't matter so much to it. > > > > 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. > > > > 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. > 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. Warner