From owner-freebsd-current@freebsd.org Mon Jan 4 16:14:27 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 9733B4DAE81 for ; Mon, 4 Jan 2021 16:14:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 4D8ggR37Zqz3D7D for ; Mon, 4 Jan 2021 16:14:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id 19so23805622qkm.8 for ; Mon, 04 Jan 2021 08:14:27 -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=geIkV/S22vbfP8EpNdjqbzrY1n/bXTRRVUcOmUgffqY=; b=OmAD0G6bSvcPXMOU2D7lG2HtitJMuH1sg5+5vns1sjlS2gtLy0PnRNZ8G4dlsyfqBn BhF+Iq+HI3lDS3+8Et65J/m2uxq+1dyc6uUH7glpvQmXtC4hsTwAkSEvLXRMioXdXzKN 7PSNuEaKv/o0wqPgop2kCZ0EmpXHjYga7ETTGZRNCOke3ojS5iVfy8j3qvztoygfFB0O zyDVjZnm4YCSMEWOEmHCdBSPuMiBFWkhe8q0XMqSUny8X7Yrx+augAkz7S/9paQ9SWrq fMDN1UHKUyUX2eXXRej9OrHkU7l+eKznkfU0CZLUf+ooSuAtWQWJP6GhstSUimsqBFiR ghTw== X-Gm-Message-State: AOAM530TeT/13xug0R6OVeRI2MkyzeT+056SOkXUGs06iWEaZXUUtxFF mN7FXccqJsRMC1vScFj8N1K4nn8EbZIq7vocLLYx0w== X-Google-Smtp-Source: ABdhPJy+NBkljTOVf9PT1rOkPoFzeJQQ1541Dg11qTS3EVLFCGAtfxJABuDcITBJxiXZnG3lT1c1bboOkriD4SH7etc= X-Received: by 2002:a37:8505:: with SMTP id h5mr50569610qkd.44.1609776866466; Mon, 04 Jan 2021 08:14:26 -0800 (PST) MIME-Version: 1.0 References: <20210104123512.0f5e1b01@hermann.fritz.box> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> In-Reply-To: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> From: Warner Losh Date: Mon, 4 Jan 2021 09:14:15 -0700 Message-ID: Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? To: Matthew Seaman Cc: FreeBSD Current , "Hartmann, O." , FreeBSD CURRENT X-Rspamd-Queue-Id: 4D8ggR37Zqz3D7D 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 16:14:27 -0000 On Mon, Jan 4, 2021 at 5:57 AM Matthew Seaman wrote: > On 04/01/2021 12:29, David Wolfskill wrote: > > > Caveat: Since the switch, I have yet to encounter a case where I needed > > to merge a change in (e.g., because of a newly-created user, or there > > was a commit to /etc/crontab or /etc/newsyslog.conf). I may find things > > rather "more interesting" when that happens; we shall see. > > The process of merging changes in etcupdate(1) is essentially identical > to merging in mergemaster(1) -- the difference being that typically > etcupdate(1) will run to completion without any user intervention > needed, or else it will flag up that there are unresolved differences to > merge and flag to the user to run `etcupdate resolve` as a separate > command. > 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. Warner