Attachment 229938 Details for Bug 260253 – Warn about mergemaster to etcupdate migration

[patch] Warn about mergemaster to etcupdate migration

0001-handbook-warn-about-mergemaster-to-etcupdate-in-24.5.patch (text/plain), 1.51 KB, created by plastickey on 2021-12-06 10:36:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: plastickey

Created: 2021-12-06 10:36:46 UTC

Size: 1.51 KB

patch

obsolete

>From 52bf2d45212a93a2351738b2bccfec072794bd45 Mon Sep 17 00:00:00 2001
>From: yetoo <yetoohappy@gmail.com>
>Date: Mon, 6 Dec 2021 01:32:06 -0800
>Subject: [PATCH] handbook: warn about mergemaster to etcupdate in 24.5.1
>
>---
> .../en/books/handbook/cutting-edge/_index.adoc   | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>index bbd2cc68f8..66126b2a8a 100644
>--- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>+++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>@@ -656,6 +656,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 conflicts.
>+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
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 260253: 229938 | 229943