From nobody Thu Mar 02 01:21:32 2023 X-Original-To: dev-commits-src-all@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 4PRtbx0Ccnz3vcwG; Thu, 2 Mar 2023 01:21:33 +0000 (UTC) (envelope-from git@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 4PRtbw6tflz3rV9; Thu, 2 Mar 2023 01:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677720093; 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; bh=hkHPH+1NbmzcgU0mDnfC89zc0fusPp9IVJZXVZAQ4ng=; b=svhcWD/rQeSfXhXQvU9MXYh7Jl8Q6zdoSdnajdkTmueKDIQQ18ZjDwc/QCnwDdMFBo4mEb hhOJhiEYTE/fIMiMrlJ1FSN8b0n8qfN3BlXPO3uugcB+OjeGuJWP8jIQBAF2g/cgpatV55 qxhcejdtmhgf5OlwTYQn9bLg9Beka+3+YpopLzE6Fw1Z+83cdx9o6Z85KC5O+J8Zdry64D ui6A+AEMrLo54NDNc6bG43Q6jUP8dYgGxE+QLEDikS18jXz09FHjL+kfRwdrEUh3tpsWOX NqqfzkVJ1Pp4Q5QfEq3tejqZuPN73gTIpoQ9pbjtyaWSmurBNQ64q6Ca76gHIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677720093; 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; bh=hkHPH+1NbmzcgU0mDnfC89zc0fusPp9IVJZXVZAQ4ng=; b=RBb4EKcQJMyybbL6rIplZPg4c9VfOPock0l1wDJUuq1Hv4Y9JP3i4umKRZFxD16Y/2fybT F7m+ZSPH6EvaPfG/A0H67pivbci5KYzNCRgHjDQ5uJPGTTjoVQjTzzRGmVhzu2xm0lN5Zx 7x0mFf5dCRE3f+1FJvmmVGYKIAMkgp0ccBBTalIUjgBLfeRlTY+S+tDDDhHLiBaKWvawwK Unv3b3Z8A3uYuu3kVAFLmrA0tKWoTDkkrOiQ45QQ+DwzAWAgV7C3u+osvNHexJXpQ0C5MS SwVLDSsgCoD/2DBUX2JT7Tqsusq5Xm1K6uDEvexSM5VY/sxUYJQkPyLlh6UCVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677720093; a=rsa-sha256; cv=none; b=MxCNYE0MZtWBDzLZqKpl9M6kahjSF4qbGxnnu5UKhZfeUSld++le9CBKLkAc/SvnQ4srtf oMp3VVvQnJFisBPgfPfiL4NuKWK+yVBbD70jyFOVm/2xA5LKFA5TUlF7BRHsjoEd9dAybs FHbOSrDCl3sGWQ+S0nj0X6wo3oU7rVOKJ3/R6RJ1V19AmOYbvMfVYVzo39bQpmtSG8LgAq ulMUFl1TfCSijM7kKUk+Aa494EH5elItk5x4j936Gq6B+UcEuZBHDZspmg7VN07vRCny53 8ZiFybl1scg1yQeHNXdZBB63jpeihLhr1bgeMjy1BgpjLgauOtSF+HNGP9TmyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4PRtbw5xGhzwsg; Thu, 2 Mar 2023 01:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3221LWDh070835; Thu, 2 Mar 2023 01:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3221LWHh070834; Thu, 2 Mar 2023 01:21:32 GMT (envelope-from git) Date: Thu, 2 Mar 2023 01:21:32 GMT Message-Id: <202303020121.3221LWHh070834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f 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(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index b6cd241c4a48..225d1e31e3ec 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2543,8 +2543,21 @@ The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF - read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + break + fi + cat <<-EOF + +Merge conflict markers remain in: ${F} +These must be resolved for the system to be functional. + +Press Enter to return to editing this file. + EOF + done done < failed.merges rm failed.merges