From nobody Wed Jun 21 12:58:37 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 4QmNq15m3Sz4g2NX; Wed, 21 Jun 2023 12:58:37 +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 4QmNq129fxz4K3T; Wed, 21 Jun 2023 12:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687352317; 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=rXHoQQ+F+jcXdiXlS6J9wmtCYXmwH9OGgkdZrNZMfX8=; b=cqXBZoB/XXJGtA3rtZ6xiR5Z4cvlm96Kae8FzlVp0Wb92E6+w2iXwRSLCJx6ts+UPTceyg wNHQuS++gcujjW0Ae21241YhZAeYpSjDceAgtrWaC3535P741perYnQZvBt1xmerRD1ymi priN+anPbDpgNnUKTl6BFeczxl7DcL65UcwjL3AYxIVJHysxCQvER9Kr7byiR0jVspTfYZ lNaRA/BiaEjwl8qpm6yCdwYz0g4Ob3+5vZiNMSazAO6krguv4oseMvn/mklU+cA+tTJ5Y0 UsWaxbYlUyQnVD9A6KTo+Brc7dIKxSlcs73X5rquPoQa7nwRGP0GvLEGKKumpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687352317; 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=rXHoQQ+F+jcXdiXlS6J9wmtCYXmwH9OGgkdZrNZMfX8=; b=RuHsqjNvjvmHfRdViamOUBPoDd0xfdmU55e/fOMl3suwmuImk1QyVzBPcPOwHyTf/SN0Or iSnru7BBcJc1Rg53LJ2zsLALdAhZtANTZzRF24damux93PKjUKWswHTsoy/TcP52aHwObC 7zoyuW+RTss94vfvFffleO9GfIZvKHqDqpLS0ynLDP/3FPxTMR/gLj6hT4OpY46nVtiMpN fS+PP0ZbmV47KMrtlG8ak3MCz1IiSPwWUY+hJDf2CcXCvGdD69iZ02o0SngWuoH12cC2NU tYrEpH/5heEXQOwmkOKMdMr+Z3RiAEaJho6KVH4c3ALMltayn2DWjAWlh1IR9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687352317; a=rsa-sha256; cv=none; b=iW585dtbSHogTzTbV6RjvjYQHMtlqABVs3mFOUDf9hzFiztUaLtuuZA5n349kxIIaRT95B a2AqDVD3Puauvuxwet7DoyYSbBSQj5YMW/7gaO2livVuOREw1MJXx8DjYWyFU/xaXi9Cpb x6DetTvadR77r+KJ3gvIr+N9e8HIObSxMU27WYud1C1qagJIfdokSR2XFbyWEusOz5dIS0 RzNbyaxVhx4F0p7KzpvvwupZmOKxtycd6VBi0SHnJSl5IG2LIxEd3vJUlxghM1njGwwByd DxnwEWeXD+5iDEa3W+sB9APP36qB735sCxCLE+/LWoIrsIBJstLp+6UTvk+FLQ== 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 4QmNq114BtzjBM; Wed, 21 Jun 2023 12:58:37 +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 35LCwbNG076066; Wed, 21 Jun 2023 12:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LCwb9G076065; Wed, 21 Jun 2023 12:58:37 GMT (envelope-from git) Date: Wed, 21 Jun 2023 12:58:37 GMT Message-Id: <202306211258.35LCwb9G076065@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: bb727917364f - stable/12 - freebsd-update: re-edit files if merge conflict markers remain 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/12 X-Git-Reftype: branch X-Git-Commit: bb727917364f7ded1d24f599389288c63b23d862 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bb727917364f7ded1d24f599389288c63b23d862 commit bb727917364f7ded1d24f599389288c63b23d862 Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-06-21 12:58:01 +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 Approved by: re (cperciva, expedited MFC) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) (cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b) (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) (cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b) --- 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 cad1b9d617fd..56a7ac422cd9 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