From nobody Wed Oct 18 16:17:55 2023 X-Original-To: dev-commits-src-main@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 4S9bc41mPJz4xDd8; Wed, 18 Oct 2023 16:17:56 +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 4S9bc41HYMz4K0R; Wed, 18 Oct 2023 16:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697645876; 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=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=YCMlHyUUB88LzhS0cFoHDSdBszJ/E1rEO+KvdDLgft5vfO6BdPPkh+hEf0PT2Lep7dz1P4 kFKlxe8mu7lMxhBtF8I+teVAYOCqyu+FPA2GdbyjEA4dG1t12HoW97g7a0H8cH4FLsXX99 q1MM7ThG13nPw0Gh16eFDiJI553JBEI+HUq8JPSUp5DzrERKM3eLPBSEFz5FHZtMOuhzqv xjUurvLF68B9TKPjs66oxnHQGnCw08+mcVmoMDt3rQGbFo1kvjXmmmLmlZZqT1QxM0hE91 QcwIS/P/jGgyYResWclkZPdNekQRTD4JpG+3lpvBcymrscuSzHKwgv0cHiykVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697645876; a=rsa-sha256; cv=none; b=IHiKmIKHZMPBsgHAwiNC/lYrBNJfHtoFZcLaZWdUXRgNh2aP2R6H8fm+6Xyp4pNYIvBEAk ZaB5UbvYweswH2HViDholUca9OaFiD6+af6xTJIrz7g6XfyiJnGWJA+QaYfXiDZAOuau5D QxjAsXOgo4Edno51RlEVqKZMvI0OIq28cs9wDrpyvF2qTvruZGDnPvYJndH78fVL7MA0XN VWXxff/oOpZJHeym9/j1LRX+1O1DnCpjG7eOP7TVrQ00KfS4dIszbtN2PjOV1DbMCa5ts2 5P6/h+oRA7WxFH1mXwwVi5y1yA5x+XvBiFtHJUHKF18XrW0GIyl/TgluoNXitQ== 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=1697645876; 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=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=EDgkx1UUUnB24oHohFIJarTmmu0ca40tnvRyQnx6UKpk8ZpK2svncxRNgkk9ikX22DHT7g Bx1amE4mc1AUaZJjBJZXlDgzxz3fwUjwuZ6XpHV7Cs6uZB9hGEqeKVFJadrj7hBI6lrvi9 lJsXGDT7VUNBScVM921FnC0mpm5LXlOdHGQeTuDu4paxBJDKrB8jDDgaSy/a5Tua+hl/DO cutYamJWkjhYkOyW9FMpZGJrIm7RgBgl4L2KZwB2YXDfJoctOhMOMqJosr6hJPlrtg9J5o IQq/qMR6KKGa9tgUVNeIYdr+gqODPdAM2dGyj4mMwyUwptwKl73cczkL9x4oNw== 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 4S9bc40Kwjz1Cmc; Wed, 18 Oct 2023 16:17: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 39IGHtQn061691; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IGHtLv061687; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 16:17:55 GMT Message-Id: <202310181617.39IGHtLv061687@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: 3d4424154617 - main - freebsd-update: allow user to break out of conflict resolution loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 3d44241546173de00852ab5e22263ba538cd8759 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d44241546173de00852ab5e22263ba538cd8759 commit 3d44241546173de00852ab5e22263ba538cd8759 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2023-10-18 16:17:33 +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 --- 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 4866514c321e..551d40418240 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