From nobody Wed Dec 14 17:39:02 2022 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 4NXMzq09Xsz4k8Sp for ; Wed, 14 Dec 2022 17:39:03 +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 4NXMzp6F7sz3lm9 for ; Wed, 14 Dec 2022 17:39:02 +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=1671039542; 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=zHX/JuoDjTTlhOG+EeOJPzZA6UCUpbvImYaZLq/vBsE=; b=mRS06jYxC7OO+WZjUbcSxhtr2gDihGriYD2x9csF57eGul9KHGIfEAjqNbT/dRUJV09dDU mOK4SGtFzxmf8oDRtcvUGfBJERaWRzox0CK4Uimoai10leY9ZYK84UfS/9OGWV9sdVLQOe W3n0lonwHxvVZR+qkNcvoTxTqt32GM6V23b75xDaonBxlmr4MhUC335tqoYvgNYJ4JUFPF ydUoQVyvFKGgSzY2NTxMJR94DJiYsA4uv3N7FQJ2OGV2EiX3i1v1shw2V2CgN2WzCgNtEk tM5EM7qsv9Awh/yNrmUvGsLLFLJ4DOItfUHeLviu5uPVIuUGLo42DkJvYCZiuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671039542; a=rsa-sha256; cv=none; b=uaBxbxkcgpMDZm9TUiqAj5E1hmCv9ka44Wewb75jVkBfVICfHO9amSyjcWMCnLbz4gEDL4 fvVeF4c6xinbP58Jedx0v3t+w34KosC0zOiPjo9H+qRgieQoNdE+v95CfL2V3LmSiESe0F lQT/aZF4H38eI+2+LR3jStJRl3NQ9wdgGas4Yo4/nmVlLsBnohD8LEagZzeVpfQXYGNMIm P8m6ub+JekyXB786224YVfdCFMBzfyAH1nfgUsn0IrJ/MSDjcvoQ9nA9DwUAeQW68I8I9y tQr/XXli0ZZd7Srpoatq6AMrlwQd6mNw1FGU2IENdxircGmZWeo24a3jT7edmw== 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 4NXMzp5C8lz12gk for ; Wed, 14 Dec 2022 17:39:02 +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 2BEHd2YV080050 for ; Wed, 14 Dec 2022 17:39:02 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 2BEHd2QZ080049 for bugs@FreeBSD.org; Wed, 14 Dec 2022 17:39:02 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www 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: Wed, 14 Dec 2022 17:39:02 +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 Only Me X-Bugzilla-Who: emaste@freebsd.org X-Bugzilla-Status: New 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 #4 from Ed Maste --- (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.=