From nobody Fri Feb 2 20:38:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSKv2Ngyz58Dcm; Fri, 2 Feb 2024 20:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRSKv1tbJz50Dg; Fri, 2 Feb 2024 20:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRX6nfWQekdPEVfx3lPBTIPmevZfeDpn+YsYmNpHELA=; b=oTXpO8IziDGYNrjUhjTeOUjQ+ur835tVdlO3QdaNtsyuLVF0oQ4aAT5Ic4KSa2puHlK4Pf cISzQDL6MzoOvxY7n15LAc1TAXf3orJvuDfjFwQBJdBojRai/3s46dTLwB7qVbRsurou/7 uix1oNFmS4XqPlXMfB3vNKZdNZKOUPVQ1RmKGg8LvNXPNMZWnJsvev+dACV9w0oEMZbNrI i2towP57V8extlZwwIKY41m5jydgDG+sn00yfR2LOUzn8vf+zOysgSkFFkW25i1qCbjQR5 Aet3Q3/7m35vZg/ZDrswfBHsSnD2lVm39EJk90GHJ4SF4kpVQrgo3ba/NzQsaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRX6nfWQekdPEVfx3lPBTIPmevZfeDpn+YsYmNpHELA=; b=qnlpF/YosME3arrA5YiqdDkAVluh/3ULj4uu2V6lffwtv0aLIJsXa1x1EnTtFCZ4/SYaSx TztSu+yRAj6kfpKmJn97S4ruxN6fxHd5bZU2aXculK3dlO2okYUiymetSfwUP4rPrZsomW PdQvhGuCgW3XRRwNOYzKUMS3Pv8Vr+kHeH7EaAB0qHLJmA7B6EXWoVWnu3uWn3ncsRvrKe j3qZ0hFzNLJZH6/7vC1bExeaAdpCojuGchhEdWnmy05asdru85Io7Syo5S0rI02A+pmW1c RiViLsSjS5dXlak4SUFm/6me2JHAKZgwOHBY1EXJxAkamcBIT7lPlRIzZt2Muw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906339; a=rsa-sha256; cv=none; b=GpsPdyQ1Imk70KLKWfa+cIOs0pItgjbsECeupx4KobdDod7r8gaOuuRrCivweYc9DTkIhG VIXWjnS2NGFwEjagbB3xfC0QuIQWFEPhUU4iIQ4DePoUkR8u2F4J80PIk+qw3rSZgxuJCj I+1nUSnpLP21C9z8YGhbMW614lPLDPjAK1F1XaeUQ6A7njwJ9mqsmnOzZTZAqaTA8oZ57L Ajqi+eCvfN5iCw+J+10Gdp1CqQMSCqzI2dXo3mPLf2u0XcFPDzdw7JtlqhT8tIkxu2a6yI OfKtqD8LIpsF0IlNE3pUrzKDx0vXNkPpuxcax36NkzMOPhaQwVQa+nEFmbI1Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSKv0jg0zlLh; Fri, 2 Feb 2024 20:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412KcwCO005680; Fri, 2 Feb 2024 20:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412KcwYU005677; Fri, 2 Feb 2024 20:38:58 GMT (envelope-from git) Date: Fri, 2 Feb 2024 20:38:58 GMT Message-Id: <202402022038.412KcwYU005677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a8c1ffca7a59 - main - freebsd-update(8): Explain conflicts in /etc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8c1ffca7a594733a91c1513d0185be174d1115f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c1ffca7a594733a91c1513d0185be174d1115f commit a8c1ffca7a594733a91c1513d0185be174d1115f Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Warner Losh CommitDate: 2024-02-02 20:35:25 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 --- usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0d50ac8822de..1960b0ee95fe 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -264,3 +264,12 @@ required. .Xr nextboot 8 .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org +.Sh BUGS +In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +.Pa /etc/ +will conflict with an available update, then +.Nm +will make no attempt to merge. +Instead: +.Nm +will print a list of affected locally-modified files.