From nobody Thu Mar 2 20:51:04 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 4PSNYN2tSmz3wFdL; Thu, 2 Mar 2023 20:51:04 +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 4PSNYN2RNRz3vdk; Thu, 2 Mar 2023 20:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790264; 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=+DBB5HqqpdmVTpYLzYHUBf/UNaWBDv4jc1yof3LIMCk=; b=xC2FKyvYjckFbNlI7jyZpXjSeVRJoKRJ3QQNZiHUuUwhmvT/hC5ZgRGD9aTml/qnPoYUY9 UB/hUnygspFUPyI0O/Y6CDZv54LHI07xrpx1Yerdy2L8kiqF6j4srlbRpa5F7XA2rw7L9D LSoUD9/O9cFypDw4YsS3Zq8lYEIYOpld8OiNuGRAJl3xnrbz9uRSwctg/216b6bh87n7MU Br9ot9EwBtbzB8L4kMJn2j2Y3XMF+EDcqMJOpM22jYo7fygYmwlJFRe/nwRQsAtXrAWK/Q Qurg6E8Efr7MHlm71DT96tIdLcSCaAMY8EoihWNauIK4Jbx/uHAZtwZLLMu7Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790264; 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=+DBB5HqqpdmVTpYLzYHUBf/UNaWBDv4jc1yof3LIMCk=; b=EBCU7lgOjoX+3CAbTfl/ySXyQl3W+DeqevybxGCw42Wo4GNNqZMoUvKaPOflMpzQ2WqkJl pw5u748wAXWfT94VzSJLM3y0D72HMoWnFMhvE4ISD4fKKU86iLQXHxaMoJDWiGi6jmKTPs LWdoOXr6gAs+4anINVkn6MHfYk33gWCfLPFd21O/x4gxK0SZlQc1uFOo13BY8vp9uLp4QY S4OVoh/dA1eeWFtI/6OlNkebJ5aJoOFJNnkVzyyeWRs9elEO0JNFYWDv26vS9R5lNduW0m 3h7SyC58+Lry6ypEJcwjuPy8W7QS4buShgzrCpAPdpwp8RcqAjEwST/Z68D8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790264; a=rsa-sha256; cv=none; b=apM3Yb1ptcncw9NFOR0OhgOtB3iEFVhAaXJtFrZ2t4luON0L4/x39gX0UVR2n9AoomIs3c zGxkC7Rv/mqAih95XISfweBkmYGdjDdzIWpikDUj5u2z6EHVAkm+oEXgRf9oie05Lf4Kja GI4fUPuen576cjsQ3HqFUfNvVxvhIBbn4nrzFnZBdqFKLHcnONbk74mzPWu18BtkW8YYdb bJ5LMA72cD0ytPM/qjgZqtgzOgIzaOexW2LeTAeCWod1du/Z/fTKi+d+ghUI+vci0YjgmX rVRbO4U1USucTGsgcj3OuZTd4uqNigDH61II9j15aofz3js6n3Gt+loHVdGsYA== 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 4PSNYN1DtszWB2; Thu, 2 Mar 2023 20:51:04 +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 322Kp4VH093757; Thu, 2 Mar 2023 20:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322Kp4Bf093756; Thu, 2 Mar 2023 20:51:04 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:51:04 GMT Message-Id: <202303022051.322Kp4Bf093756@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: a6c6edbe9d37 - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a6c6edbe9d37caf1dbc81f918adf8c1f451a534e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c6edbe9d37caf1dbc81f918adf8c1f451a534e commit a6c6edbe9d37caf1dbc81f918adf8c1f451a534e Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:50:57 +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) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) (cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b) --- 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 078043326115..ca043de20f62 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