Date: Mon, 21 Oct 2024 15:49:43 +0000 From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 204549] freebsd-update should fetch e.g. /etc/ntp.conf.default Message-ID: <bug-204549-9-uzhzj7MqFc@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-204549-9@https.bugs.freebsd.org/bugzilla/>
index | next in thread | previous in thread | raw e-mail
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204549 --- Comment #16 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c3f49fac756f98555c516b54b680c625becb61 commit b9c3f49fac756f98555c516b54b680c625becb61 Author: Graham Perrin <grahamperrin@gmail.com> AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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(+) -- You are receiving this mail because: You are on the CC list for the bug.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-204549-9-uzhzj7MqFc>