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

From: <bugzilla-noreply_at_freebsd.org>
Date: Wed, 21 Jun 2023 12:58:53 UTC

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


commit bb727917364f7ded1d24f599389288c63b23d862
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-12-14 17:34:59 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-06-21 12:58:01 +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)
    (cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b)
    (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6)
    (cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b)

 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.