[Bug 229689] freebsd-update shouldn't add system breaking comments to config files

From: <bugzilla-noreply_at_freebsd.org>
Date: Thu, 02 Mar 2023 18:32:03 UTC 
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229689

--- Comment #7 from commit-hook@FreeBSD.org ---
A commit in branch stable/13 references this bug:

URL:
https://cgit.FreeBSD.org/src/commit/?id=c7e3703352037a5afacdc4126725f351fe7da72b

commit c7e3703352037a5afacdc4126725f351fe7da72b
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-12-14 17:34:59 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-02 18:29:57 +0000

    freebsd-update: re-edit files if merge conflict markers remain

    freebsd-update will open ${EDITOR} if conflicts occur while merging
    updates to config files.  Inform the user if they've left conflict
    markers behind, and go back to editing the file.

    PR:             185546
    PR:             229689
    Reviewed by:    delphij
    Approved by:    re (cperciva, expedited MFC)
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D37703

    (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f)

 usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

-- 
You are receiving this mail because:
You are the assignee for the bug.