From nobody Sun Nov 06 21:37:48 2022 X-Original-To: dev-commits-doc-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 4N574r4nbPz4hBbm for ; Sun, 6 Nov 2022 21:37:48 +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 4N574r4FLwz3SPN; Sun, 6 Nov 2022 21:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667770668; 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=ajaM2OrAK3fPYAzOjjJ4PVYYoAsMO5x2maOIhtXZFdY=; b=I52Go1xnr/uBgwwwWP/MvKvG4JmNaa/GwrYEZFa3xW0BOGUe5vd3jUUtWRcuKONatjmxQl G8cl892HPmq2KkCZg0oAHwF5dSOs3Vsl5weQNQvtKqDzhwDQ8VV1HNYloIN0v+l1X97CDJ m54aePPpWYC+SpddVhyqkBcuSruXCnkLJZj5Eql7CLHsFM9tlC4x0GuWE0XOjNlP6PnkGG +ICcENJfmiLzLHeziwsdiHtBaz9VEtRv8zSjAPxibyZWefouY15KAUu7fCIP2Oj3/Qg/DX l9Vdq03nvXjOOmYc7Mhrfb586N0jB7NIuGlSjoayWWMl9jEU4yvxlVK0XrMPgA== 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 4N574r39zFzby0; Sun, 6 Nov 2022 21:37:48 +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 2A6LbmvZ093179; Sun, 6 Nov 2022 21:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6LbmvU093178; Sun, 6 Nov 2022 21:37:48 GMT (envelope-from git) Date: Sun, 6 Nov 2022 21:37:48 GMT Message-Id: <202211062137.2A6LbmvU093178@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 313c8a75f1 - main - Add warning about migrating from mergemaster to etcupdate List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 313c8a75f1c13995dfa1dee6fe6225c32f564c5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667770668; 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=ajaM2OrAK3fPYAzOjjJ4PVYYoAsMO5x2maOIhtXZFdY=; b=jUoW8PEjTaZXjDZMvADVFY83GT/P/VAppaf3pq3bM4R025b9nePDgabGki2HcKGc51b9wM ldKkMPik4zBmCB9YDeUEX1tDTVhBIoo6H4/jWZU7RkAlv1195Aind+b5rUZ3piAsAy/4Yq d/pQuYMgPwS7FIa3Bo7ecKMH0J/32jTVtyWFYXDbH4FRkAscsUh0jF1R+VcAkZzenunBDb 9Y/rvO4503kIN6Inlv6Gx6x6uU0AiAWyyf1RJ0DYAfHNzB71MskBCgc49JzJZXCjhQIcbJ mox7debJsjfEV6420/SPeV5keCgMZnb+JWcC0/jW4dwHuY4iySU/L29wg849Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667770668; a=rsa-sha256; cv=none; b=OmLHBrmcjKBlz18buhS86Vyn8TVloWMzZtLnl2gvCQZco9bETru8PUI9IgVSC9gtqfPl+H 8CttzdP6iyxK7rGMmkaijZLAx+tiyHiTufHh7Rwzi3y3bmdTLRoi07OA5QyEZ7ga59ILFG lD5tOoqy5xVPk+y5tTlsqFLT4Iv+Im9rBMCey4mTnprJmAYQZpkiCdElaxUSrcp0qZsPrD e+6LiuoyHMTi+Ix/3SdWl6vV4V3LSpePeIlX0PAaVQIB5i80ciZVviuKWltw2e0j+P2u8G jw9nCrlFZ95FyBXP7A3B9/500+iRZM3zoYqClIxsbEIlP0Goa63Nv1G5e2pSEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=313c8a75f1c13995dfa1dee6fe6225c32f564c5a commit 313c8a75f1c13995dfa1dee6fe6225c32f564c5a Author: yetoohappy AuthorDate: 2022-11-06 21:36:36 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2022-11-06 21:36:36 +0000 Add warning about migrating from mergemaster to etcupdate PR: 260253 Reviewed by: pauamma@ --- .../content/en/books/handbook/cutting-edge/_index.adoc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index 7ad3692bc1..8e5bed211b 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -666,6 +666,22 @@ The build process takes longer to update a system than just installing binary up This is a quick reference for the typical steps used to update FreeBSD by building from source. Later sections describe the process in more detail. +[WARNING] +==== +When switching from man:mergemaster[8] to man:etcupdate[8], the first run might merge changes incorrectly generating spurious onflicts. +To prevent this, perform the following steps *before* updating sources and building the new world: + +[source,shell] +.... +# etcupdate extract <.> +# etcupdate diff <.> +.... + +<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8]. + +<.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates. +==== + [.procedure] ==== * Update and Build @@ -967,7 +983,7 @@ To prevent this, perform the following steps *before* updating sources and build # etcupdate diff <.> .... -<.> Bootstrap the database of stock [.filename]#/etc# files, for more information see man:etcupdate[8]. +<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8]. <.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates. ====