Date: Wed, 14 Dec 2022 17:39:02 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 229689] freebsd-update shouldn't add system breaking comments to config files Message-ID: <bug-229689-227-ZcZNzvvM1J@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-229689-227@https.bugs.freebsd.org/bugzilla/> References: <bug-229689-227@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D229689 --- Comment #4 from Ed Maste <emaste@freebsd.org> --- (In reply to Graham Perrin from comment #2) Prefixing the conflict markers with a comment character (#) isn't viable - = it could result in even more confusing or unclear behaviour, as the config file would end up with a mix of potentially conflicting settings from the user's config and updated config. When freebsd-update encounters this case it prints --- The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... --- and it is up to the user to resolve the conflicts. See https://reviews.freebsd.org/D37703 for a proposal to inform the user if they have unresolved conflicts (and return to editing the file). --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-229689-227-ZcZNzvvM1J>