From nobody Wed Nov 22 18:12:43 2023 X-Original-To: doc@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 4Sb8VN4jSQz51L93 for ; Wed, 22 Nov 2023 18:12:44 +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 4Sb8VN3Y9Qz3Ygl for ; Wed, 22 Nov 2023 18:12:44 +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=1700676764; 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=iGLvOyZQB4zaKal7YRCqkZ2cQGWK/pIcogyEmX+6CZY=; b=FWNOvCAWqjJDgU2Y0tRdMHkWYKeJz7K8CNuSMlIKSWKJY6NB3PVI+ayC2Bxj+TEO+duMm1 /AO9cV5pDbxno2XONyb3L2Xz/X0D7MNiNytrhJ9s+Sh8VHZ2JbsawOXlvKMIm1owaIOOr7 i+o57M6fffmbg9pxpFz4FVK4dYMl+wV2rA7UHBsBdAftMKMwYSD8wCG4spR+MAgxS5hzfU QqlgmHOy3D5AJmKksknccdyhNH5Qnz07BQhY/yXN7avmsYCD3nCaJLRL49vUE0T38gyx6e oehr77M5tijY2btk+aotOW/6AY/YNdNtXgRgpE8YOtxw4y0QxBGvpKcPfT89OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700676764; a=rsa-sha256; cv=none; b=iTBsWDpA7du6y/k+DW+VQ6vTR1Xzd2Q/FEHSQJU3msN+legX2OIXv70OyCTWybBr3vQ1Vx yt1cOrpjbYL27wubS/fevFOOuIgUkTtv2u/keochd0FYGdWzFKBLOR1nu35f+XBwrAG/nY NkZO+dYza2a4XysOgMreI/OJWAf7Q/BiUpfn4irqLIXYf1IU6DJ3r5sqLMDTmvJJHuZKNh fAnA7/vmVTKEgkq64Z/o08KuS4xIozPneIhVkLyytL8k94/C0fhEzGFgD7dcshgrWSTC1H 4908N1RTi3kAYPsFM1kjsTnpSx8gZ6cGrF4acKHCJzI6H54IVA7F2PF4iuUfZQ== 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 4Sb8VN2f1LzVKy for ; Wed, 22 Nov 2023 18:12:44 +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 3AMICixK010315 for ; Wed, 22 Nov 2023 18:12:44 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 3AMICi9R010314 for doc@FreeBSD.org; Wed, 22 Nov 2023 18:12:44 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: doc@FreeBSD.org Subject: [Bug 270852] Extra characters in config files after upgrade with freebsd-update(8) Date: Wed, 22 Nov 2023 18:12:43 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 13.2-RELEASE X-Bugzilla-Keywords: needs-qa X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: emaste@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: cc 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: Documentation project List-Archive: https://lists.freebsd.org/archives/freebsd-doc List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-doc@freebsd.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D270852 Ed Maste changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |emaste@freebsd.org --- Comment #6 from Ed Maste --- Note that freebsd-update will (currently) refuse to proceed and prompt the = user to re-edit the file, if conflict markers like <<<<<<<<, =3D=3D=3D=3D=3D=3D= =3D=3D=3D, or >>>>>>>> are found in the file. --=20 You are receiving this mail because: You are on the CC list for the bug.=