From nobody Mon Oct 21 15:48:56 2024 X-Original-To: dev-commits-src-branches@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 4XXKVJ3y7Mz5ZRF0; Mon, 21 Oct 2024 15:48:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKVJ319Wz4vKC; Mon, 21 Oct 2024 15:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525736; 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=B4NSgPJCWkC5UtL6f+88Qc6FsqBIVhOZrkfwWfvbKsc=; b=buaKiOIKIvWV7a9A0JMuIYIH1vswboh7JCMxmLtgNyYDY7ouJwrmrLG9RMSNPwG2IJL4o9 HQDuXzmlFcnjBLJPCGgpxQmRmf1sbwZpu8M9PMvikuPNhq5nI6Qalj7bnbfHvsTqaFMuas nHLTWpRWN1pqRQBZkPLoC8Q9Acv3HGAOQnIZ3/LDiFVLM8Wfy3nobvn/NM7tsvl1VXkR7+ CvcZwjQdh9ryxTK3sM36F5yCXJssn6x+h3cWYxWtzci8b3fbEAR502gRsJU7CxRwnum5pY DaQZjm4YrOXSFDJzYVIpFNWR6yCDpHUWTPK03IxFHVlUJojaAVA8j4m980R0rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525736; 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=B4NSgPJCWkC5UtL6f+88Qc6FsqBIVhOZrkfwWfvbKsc=; b=ng6g9TFSJFHt2nz8y/CdgKJsq4xJoatyHR7GXz/QpCZRY2XIv/1tGa9ERTycvPdUqjq534 VUpBeSOtPg+Xt2wgpY1vLQNthFxy9fuLy2JVG2QWbqdkXiso2jChVPz3gi/fQwBPVMeeeG pVw9wocbGn179CE0BCYlklD0b4p5f5KnNyJnhxyRKJreBAY/d63iy+khk2rTif0vJvr0VN 1Oe5G0UF7bhdv91wbqDBWyAG+fG9ZP/kU6hX4fHeArKb/ATQzXr0DdhEVcoJ5u0b+csJdS 5Whl6r1L7Eo9SmYrECMAeEf+v939WMgEriqN0wej2WgbV+A1QtOaf6FXa2HU3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525736; a=rsa-sha256; cv=none; b=yjj3MNeZvhziY4h7DKoDknQDpgVF8wwoiFdAlOACjOJHKl8AE40UejFDZ/uSadIq1EA562 0zygSNQfkbiw/yZ/N4Ghz7MeJ4OCmj1kALaB6bPPOVHitbkLQikTG7/wLyNXpLCRIJKghZ dAMmkZpyisasf1Uujshx0eUx/TVoiJazLY77Z7ESNgn7qmMrqEoQyi/07/fzgldlfITlWm ix7drPSerenNC5HUOlSgWPw9lSG5PKlpFUsINyvJQMqF1YG6O2ZHYNbBnuHMPDf+spJtdc KmPgNySVyyLwkDtK7lrwl/vS4KmcUZJhHaPBE1vx5zgz23ZD2elA1bKtw0Jr1g== 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 4XXKVJ2PRczbhy; Mon, 21 Oct 2024 15:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFmu35022552; Mon, 21 Oct 2024 15:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFmuYJ022549; Mon, 21 Oct 2024 15:48:56 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:48:56 GMT Message-Id: <202410211548.49LFmuYJ022549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b9c3f49fac75 - stable/13 - freebsd-update(8): Explain conflicts in /etc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9c3f49fac756f98555c516b54b680c625becb61 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c3f49fac756f98555c516b54b680c625becb61 commit b9c3f49fac756f98555c516b54b680c625becb61 Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:48:45 +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 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) (cherry picked from commit 85f889aa9cdad831a68b42050d1adb47d4eb960d) --- 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.