From nobody Mon Oct 23 23:36:56 2023 X-Original-To: dev-commits-src-branches@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 4SDs6K118xz4ydLR; Mon, 23 Oct 2023 23:36:57 +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 4SDs6K0Bjcz3gbW; Mon, 23 Oct 2023 23:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698104217; 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=L96eniPnNs6F9qfawRf1Gr5XpQ6FpO5+Bj6lF5AonZg=; b=VNnTrP33ySbgVJ74A/YVve9S5i0kK/P1a+mfHhsD8ZW7ROU61ZULP7cC1P0f+1Z0zIis9Y KHyp10pM6YWhCipqC7gZ0sgPf3GiA64TbZ70oOMvgMroM6+3sTcIwXmVn8nhY1CM+ws7T7 1oXF9TBM8SF6qp65E5tv992a6m8mV+DrV9Qjr7ed9POtnKVJUawU3fE4dqRRBeftsCMohS h63dioPvrdph+o/a20E9dGBBm32zqlu+/F6+GW/FTdbzT49AvwsO4DA8xA3tGJGbNP7MW3 PR+ns/XqbOzriZeYZltoVfqtZHhygSCEwS7SyrCo2RUTHUI1wXpwrZgWVX3a2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698104217; a=rsa-sha256; cv=none; b=w/kXysbDTq2u2Kdhi6fL06ludIuVcuXOCJXKE731l4F0Ltha5fdA+TR23ESEDl/MP5XR6e nLDI0no+oAgAGxTTLbGbFYLpFLnIiZV2z0lQ+KEGiRBn/GuXjGTPQcjt+dvA03yliqjDBn mC8blbyQPAkm02VVLUxMopSDgxyBWuWS2SFdj0S0Onj6fXWb6K5As2Cs9+oMjSTQ8e52vg UA7GjhRhxNX+aDIpgUyyzHLb2yYQ1oM5VkJv8EPYOkev9C2ix/RsyDGHkyJgXz9uRUK982 eRwh/G464UYBk+jUARwfJJRPZH8nEfkoUNbLmZ/YsKOMv+5aT/OeIF/9SccmBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698104217; 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=L96eniPnNs6F9qfawRf1Gr5XpQ6FpO5+Bj6lF5AonZg=; b=fuC9FxQSUeiMq5chYQBG8LcyCwH3slzus5P0Gq3unBZFOLKsNiTl58yk8ut87Sb4ywuLpl lu+vgi70JSZDpFfkQuxOTgjunZH8SO2C6iYJAZ/e2P4OcrUmPb3qQLC8hrjzGiAmXEJRgV TNMwIQRJNpUsNEJbwiwL3PBmQ9R5miIL+ux+50MrhTCvYMd9DbNQIaKhUFY5ODlznvlCkp Ti5zHrA5c3lJVqplkTQs/dEgCyQoJ1+da4NmZ1u6cBCuOyr+43R4CzQNPFLJx6HkGZfYH6 Jlul4HUSJRMUyOd2lfCafA+0QL2iKDte7oCntggAr2IEmV8vU2pTtT5w6CWmJg== 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 4SDs6J6NLTz10Qj; Mon, 23 Oct 2023 23:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NNauLO087586; Mon, 23 Oct 2023 23:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NNaurN087584; Mon, 23 Oct 2023 23:36:56 GMT (envelope-from git) Date: Mon, 23 Oct 2023 23:36:56 GMT Message-Id: <202310232336.39NNaurN087584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6561fec386a6 - stable/14 - freebsd-update: allow user to break out of conflict resolution loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6561fec386a6cbe65b3f9661db797317ab6a99b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6561fec386a6cbe65b3f9661db797317ab6a99b4 commit 6561fec386a6cbe65b3f9661db797317ab6a99b4 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2023-10-23 23:35:57 +0000 freebsd-update: allow user to break out of conflict resolution loop When a conflict marker is found during update allow the user to confirm they want it to remain in the file. Suggested by: Tim Hogard Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...") Differential Revision: https://reviews.freebsd.org/D38896 (cherry picked from commit 3d44241546173de00852ab5e22263ba538cd8759) --- usr.sbin/freebsd-update/freebsd-update.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index c6432dcd6b0e..0cfd29731126 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2544,7 +2544,11 @@ Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF while true; do - read dummy /dev/null; then + echo + break + fi ${EDITOR} `pwd`/merge/new/${F} < /dev/tty if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then @@ -2555,7 +2559,8 @@ manually... Merge conflict markers remain in: ${F} These must be resolved for the system to be functional. -Press Enter to return to editing this file. +Press Enter to return to editing this file, or type "ACCEPT" to carry on with +these lines remaining in the file. EOF done done < failed.merges