From nobody Thu Mar 02 01:22:04 2023 X-Original-To: bugs@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 4PRtcY1pw3z3vd10 for ; Thu, 2 Mar 2023 01:22:05 +0000 (UTC) (envelope-from bugzilla-noreply@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRtcY0GHlz3s4m for ; Thu, 2 Mar 2023 01:22:05 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677720125; 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: in-reply-to:in-reply-to:references:references; bh=DFyjuJXqVlJq0ezgYYB0Dn2l/jI8Av16o3pFU8gULxY=; b=OwLB/o04aAP4zXkGIMrs0bp2fVw7nJz6636AkfQnk/v8fpN0qzFTNLFoECnTk1CAmCIWyd Lfvw2AJZlT/Pba+8E4/toewYoQs/6JFPJe8W+oUQEMNkLZV0DaHPS4FkwrA4b2I8UltwOT sJC2QqiUgWV4vwTCUAe7E4xsBlOV4DL78DoT1zQx6sFMrUqdQQZ3/NvnpACkZ6wthoppdi kZXXQ8JMXr/Qz2bFELfFQ5nwPeBgEBX8USgF2n5OMsJYGof5mIkjOKrbP0pXRmDAHP8/7M /FhLdVDD8N3TvxjDZFCFpBgI3DxoAo+THmRmHcgNXKEv7eTlfrco8r0x2A7qlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677720125; a=rsa-sha256; cv=none; b=osUIN2FrQuwym71QwgoTcGknUtFZYXTvaHXRVURbYqRAh3EJ0bkfir2dOtYeaV7x/A0al4 P7dz0eJ8fWAbW/sgl4PALhUOCcQ3PvQri51D4JG5ZhwisvyZul4+z9Ig22kr03eQRRcbVg 7qkSM7HSAZui46ojVkFcbHTKKOpLJ2XUIVjnqWh8v1TfDdXCuOd+xBCBS0hJ7wXCex0NjU qfJ8tA1EUBmrpn7aCazk0Odddc26pao63MR0ARW19BhvpM+C2IxI8B6YaVdwq4m1zsZC7T ah1K++igwargK6jDIaBV2aTE8Q8zsmdw52gqmySmnOgVWCVj7sm0QWsswOU4oA== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4PRtcX5JYnzwFv for ; Thu, 2 Mar 2023 01:22:04 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 3221M42Y004856 for ; Thu, 2 Mar 2023 01:22:04 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 3221M4vX004855 for bugs@FreeBSD.org; Thu, 2 Mar 2023 01:22:04 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 229689] freebsd-update shouldn't add system breaking comments to config files Date: Thu, 02 Mar 2023 01:22:04 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: conf X-Bugzilla-Version: 11.2-RELEASE X-Bugzilla-Keywords: needs-qa X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D229689 --- Comment #6 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327d4a5ab= f2a421f commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 01:20:33 +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 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=