From nobody Sun Jan 07 21:25:51 2024 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 4T7Vc02ryKz561gX; Sun, 7 Jan 2024 21:25:52 +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 4T7Vc01TYdz49WP; Sun, 7 Jan 2024 21:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704662752; 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=6HCvM8gQsyF2z2WzHqm0BJLHQfkehA2sTQo9lNHIW3I=; b=frZvFZN4pE1y52xBrkdJF3YWjIKgQdZhab9RPavYy7TiO7J9bUYmgQ/x8iLKWSzr1PMFB1 3bKidoXoXXszvMNXhqC2EAsQrzGeOEcrh3VDS8QMlLncbsEN/WF9RC2Dnbi8Fudd2NCezi jJy3Wo6XglTjulQFKKH9A7m+oFRafOuMtrGwtTKJwPNEFN39cAJgWGwzPNu171Ot60hZig KmCJWHUKPVWzGElgE764CneJoQKobmNV7yclYe6Gw53syoXcoZyiPspl7ehAupJD7/RHUi G+kkWXmKeEWPVC4IP7YSUfgpFiQhcDTH5QfJZRHYwwAYaRZBVxAiw4pRSpYCyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704662752; 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=6HCvM8gQsyF2z2WzHqm0BJLHQfkehA2sTQo9lNHIW3I=; b=h9CcjG7ik+lRj2v10II7H+cKrOaXWl3UMrisyupMRYsOeXAIswD0oCn7t8Y56Sn80xzgiF bL9f/NAblInuC/jibBO/nFjLQTZV+RFvp+FnYrqdSy9HrRkCdPX/QTJ8kCDyT1HxOXNIiY buM2YcogST/gwnmNcR5QytBm8DE0YbuJMqnwOZlTgdoYhiMa4/mSojkifyq+o4B7uj7z31 1KGNny8zyS6zm6lOwz+f8JQ2hZVVFbjKMThFr2JlV/H5/5XpqAKR2d5UbAU9G59ainfZQ+ vgQPUKk43D5QecKPTHv8UNNULtTf8aWnqIgMMH4Zl8l6dZLw6Yy3IGr2Q0UbDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704662752; a=rsa-sha256; cv=none; b=rPoLCyWaWrROHrzYTlnGTK6xUQq/mAag+mBdCjMlfmahGA6RPPweX0KrB+W693li7DhyZn UrppBL1+fCjSNX5hznfqtXbw52Jfugn+DOmuj0tMuznyu/jVlouUyiSfNH+cMSkgDXI3x4 9j1tv7Gf9puJFdKcWNFpdJvOQkqTl6Md4P3ikaHa3Js+sYsacM6wHLE5Zv+hh1Ijd3uNP+ AYgOmdtTMVlvIS6nLmlGrC8wGuXNjTWroTjCwllDvUJPbmA8g1EBul6Z8SuYPeo5sQEKUC 3UhksMJb2GiNHOZzpfTSX7+opVkt4sFRPvzCN/zKQNup1tx5q8XxnwyZ2AMjtQ== 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 4T7Vc00Y7NzgS2; Sun, 7 Jan 2024 21:25:52 +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 407LPp8c083987; Sun, 7 Jan 2024 21:25:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407LPpcd083984; Sun, 7 Jan 2024 21:25:51 GMT (envelope-from git) Date: Sun, 7 Jan 2024 21:25:51 GMT Message-Id: <202401072125.407LPpcd083984@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: 72e6ffc21cc9 - stable/13 - freebsd-update: allow user to break out of conflict resolution loop 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 72e6ffc21cc9760f1a3680bab542de5e991c7260 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=72e6ffc21cc9760f1a3680bab542de5e991c7260 commit 72e6ffc21cc9760f1a3680bab542de5e991c7260 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2024-01-07 20:41:48 +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) (cherry picked from commit 6561fec386a6cbe65b3f9661db797317ab6a99b4) --- 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 438e13a51154..f5289e1cd9fc 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