From nobody Wed Nov 22 18:12:43 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 4Sb8VN36cLz51LCQ 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 4Sb8VN237fz3YTZ 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=X31/PVwu5c14N859utVkuctZNAef1WJ1pM1b8sdwOwY=; b=bzj5AjeiHj+iZWlJLiQTF/cIEYhQfN5LXSDpO5XF2g/NjXUuREBF4yZWCi6DkmLCzNBZgE j4lNyr2xaKG3k/tTneU0FVy0fYQrccfNnYHQxhYT5AOZ/Y2QmhPH/EdKiQutFMbyL3qPm1 up1QKL2orgz7UCmYD9V9D2yP+2n83cqZQL7lTHNnle8dERQExTEI+ECyTg1SScEVLbfam+ bUJEMWDH5x2mSuR2biS6VrA/k+gqNL16RhOrLgN3wmzqPHRPxaQfjNRMtIh0cn6OkLW8rp W7Hc80IO6GW2ZXvIm0haw4nmTLyowv/OvHogsc9zDQPZ1quXQ82iwOg5mt4tYQ== 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=XwTOJ+atV3hkq1wapSQ1ZAzfG6sXjoRfH1Ot/83Z/W3B4TL7+D+AE0De8vVxEpiUbClshi lAHG/OwuqoiGMCuQ24LxlNnQMxq/dYnx4jfYEZhzJPFsDWdbAUWs8Jd6HD25vSbKx1Ggks Q/+m7h0RE4N+MPt4IKtiKc3CiFO2dFgSuB2kuvKindN6S/DxVi1sqBe7r2Wg29oZYyZF7e ffxlBPbuJO0iIYQeOcU5WWYj6Csseug7fXe1xBw/rm/C/MjDe3biWUDVO7IM8hPIJ2w3OC 0+VQqlWQxAYT/bmUbgJDDtcwwliTluQ9ZuJoRThhyOasAUwZ7SO8OwdlEiEutA== 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 4Sb8VN11ZrzVKw 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 3AMICiv1010300 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 3AMICi2H010299 for bugs@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: bugs@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: AssignedTo 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: 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 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 the assignee for the bug.=