From nobody Thu Mar 2 18:31:10 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 4PSKRy230hz3w6qb; Thu, 2 Mar 2023 18:31:10 +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 4PSKRy1bSSz3Q4C; Thu, 2 Mar 2023 18:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781870; 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=IKuFIRcddA/AMM/Bx8gQ2Kf2MqeBgQdOAK9jojo+Gk8=; b=plz22H1NDiifVcgCK89uzCfN37smMQWPkBs1d+Eg8QRDl4jdjBbw/R4I9eWmANSiA7qvjR DOABVGcUhzron9CUB3HeR74HvYaO8L1YR5tRR5toqFkAvezaXNSXzg4VnYM+AWoe0Y6r7b 4d5xeQG156qISY9mAowSutq969pSbHg4LwkaMEdMy3HSMPwvr5A/UI9qnyDQLKZw7G43yE XiUCTBAe7xmnVKNJRAxB387a8AcM0Tdt8ncISWMyTszxV3NkKTqymVxX5O2aFV5j91qAQ1 e/IyJpsLrqiTbMkAZJTBP8wD9G4y2G2Hkv3QfmpSJKxhmjbXJZDB15qz97fSjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781870; 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=IKuFIRcddA/AMM/Bx8gQ2Kf2MqeBgQdOAK9jojo+Gk8=; b=kogjlWIpgzhHz3PjtRcOuaYxF/2ef4mvDg9W5UBtUZ3gdsOLAuxN3949yubP3fRNZX+LR1 xi+9V4UJvP7ew3b6u1FHhutXr2LWw1uZp19l3LlmBDSeasixey1zDaI5BBRwSTW7qeibCk 0QP5J1R3VrVKer3n5y/o5HvgZKOeanXuzSf/hwnswbIN/HubPD1+zK/RBgWwNAuYBbklqs wiEG+LM95RvfAWehdhjzLmCippeXKyKp9n/lhMJTCH3d/arSuub1DFLUb4DfhV08FC8rBF JmXIyfXCFQEX9CZ1vgMJs2HIWUK8XVdyMwveXRiTf1Olda9xUZKbPXt5soNnlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781870; a=rsa-sha256; cv=none; b=vQNpBG3U7kxYeFsg4bPmHtqQjRJZFYV1Wf/mUbBJPqWdRJ7EXiOYUIRVZP5ifg0SSPLgY2 2FyCxHLzydT65I6IDO7baXAvBBCjCiQoPP0RNQN4aC2MDJeXAW5c0F6j4uEhk82LUQUoXs eLooWUyrA9SvfEsm3gL1vBraSHVfgO8VsRTvOdUgIau+sE51lhuzZlWja41BJmo8RHWT8w JASifPgnpMVlabMMAMjVtUXUnrQ1bXk66nUxxWRKpWhPEl3CYUdu3B1gG5w2SBBGbmEco3 Knmohjrn6NxzZ2gxBD0BD+MVnT6XUhdRDOjhtvcOx/KZkQ+WLRNghKyyQWaw3A== 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 4PSKRy0gWfzRHV; Thu, 2 Mar 2023 18:31:10 +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 322IVA6a062590; Thu, 2 Mar 2023 18:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IVAOH062589; Thu, 2 Mar 2023 18:31:10 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:31:10 GMT Message-Id: <202303021831.322IVAOH062589@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: c7e370335203 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c7e3703352037a5afacdc4126725f351fe7da72b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e3703352037a5afacdc4126725f351fe7da72b commit c7e3703352037a5afacdc4126725f351fe7da72b Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 18:29: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, expedited MFC) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) --- 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