From nobody Mon Oct 21 15:47:06 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 4XXKSC0wMqz5ZRXh; Mon, 21 Oct 2024 15:47:07 +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 4XXKSC0MHDz4tZV; Mon, 21 Oct 2024 15:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525627; 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=YwC8n1jBgBPV7A1/azSX4ydW2jYMpfv8mwbjdbnzTi4=; b=r5so6X5fBfErbzV8HV05kly6F+Oke9uP6MPd42vbPmvjP0ApLSHvW9wgKmyD0cB+3Y8pOg kALTEBrNAjqXslXfI30sNt0/e6eFcHHop7wCNjqT8dwV62MFk+V0ytWdj3g0nGGyfHurUh PEUZbtJUBgckhMsjMYcbUSV6eK9noF9cOwocGhDA9aedgS5ga2YpbN5vO+Clip4i4hJ7mt gRmIfm9orReLX3rBHSrPbKm1RNCcTASESzDroTqzg5bQcLEuSpMg/ZlKNOP0PKTPV8hBYI CRRtVnnbzpEkA4LXBKZPDTGEXZmbbCHWRiheic54trNaraChwqqkdHAh1PSQ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525627; 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=YwC8n1jBgBPV7A1/azSX4ydW2jYMpfv8mwbjdbnzTi4=; b=h/MwoWbz/ZXZQeGLf4asKLcMcHWOUCUgwKXfSi8sNxogkolJ2ynjdhl79/PrIbOS0u8SNJ acoBX70ehCw0SHVl2K3yFrpAjgdL/v4L5l/JLYMTI5aRAxmSzQSALRthQnyltFJalRv0Us bODDKAqkYT6GTBJ/4tbqdL0ZMSjRqCqmAhT4ZTCAk8XAOihm1fnJTmRd8RpyJiY5R8AyaR B9i+vSTlAJwuWaLonIIYW25Je3Xqg1vak0MQjhKNl749KbK/UyysLbgBABXN1VWNT5XSoT Pac3JG4AaC/y/ZuEazmKoAGIl+MgcAXKG0czs3WGv7Lh0a/9JfUShN+YublTsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525627; a=rsa-sha256; cv=none; b=xL4zCdRPrtjOJuir+DL013IqcHEExFldW3Mpzodjp0VjWdAlOFCsJ7jHRfkgbS2ccElCOW OsmNl3Y8E+yvERQDOe8iasPHjGngrrjU5qLVL3dE4QqLBNqmK1rnSKSHX8EnsQvUrxzLXT nZVWkql27HfZb/cf2rrRprOWQYcn/T+GFDcmdBbBMg0eB+7O0Qt10/7Iw0/mflnLUVnpRt SRqx7fmp8XTgLnKpoWJi375NISwgxcMQvw12EB38t2Y0HQtn9cRcP8ArcDZ97qWtM75dZL grjjTC92GPmZagoId1VQ+210bXUfk11u3wjgPPops5EwYv7CiJcbwoowH8bBxg== 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 4XXKSB74rkzbvq; Mon, 21 Oct 2024 15:47:06 +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 49LFl6vb021815; Mon, 21 Oct 2024 15:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFl69f021812; Mon, 21 Oct 2024 15:47:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:47:06 GMT Message-Id: <202410211547.49LFl69f021812@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: 85f889aa9cda - stable/14 - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 85f889aa9cdad831a68b42050d1adb47d4eb960d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=85f889aa9cdad831a68b42050d1adb47d4eb960d commit 85f889aa9cdad831a68b42050d1adb47d4eb960d Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:46:41 +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) --- 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.