Bug 274967

Summary: mergemaster.8: postpone removal until 15
Product: Documentation Reporter: Christian Weisgerber <naddy>
Component: Manual PagesAssignee: Ed Maste <emaste>
Status: In Progress ---    
Severity: Affects Some People CC: doc, emaste
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
See Also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252417

Description Christian Weisgerber freebsd_committer freebsd_triage 2023-11-08 18:52:22 UTC
Apparently mergemaster(8) hasn't been removed from FreeBSD 14 or -CURRENT, so the deprecation warning in the man page needs to be updated.
Comment 1 commit-hook freebsd_committer freebsd_triage 2024-04-16 14:21:24 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=73cce7d8886bc59284c757decb49deba046e73fc

commit 73cce7d8886bc59284c757decb49deba046e73fc
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-16 14:19:14 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-04-16 14:19:14 +0000

    mergemaster: postpone removal to FreeBSD 15

    Mergemaster has been deprecated for quite some time, but was not
    removed prior to FreeBSD 14.0.  Update the deprecation notice in the man
    page to reflect this.

    PR:             274967
    Reported by:    naddy
    Sponsored by:   The FreeBSD Foundation

 usr.sbin/mergemaster/mergemaster.8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 2 commit-hook freebsd_committer freebsd_triage 2024-04-18 14:20:29 UTC
A commit in branch stable/14 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=c0e5d8f9bda7907c83901d25d1d123a5b180443f

commit c0e5d8f9bda7907c83901d25d1d123a5b180443f
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-16 14:19:14 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-04-18 14:05:01 +0000

    mergemaster: postpone removal to FreeBSD 15

    Mergemaster has been deprecated for quite some time, but was not
    removed prior to FreeBSD 14.0.  Update the deprecation notice in the man
    page to reflect this.

    PR:             274967
    Reported by:    naddy
    Sponsored by:   The FreeBSD Foundation

    (cherry picked from commit 73cce7d8886bc59284c757decb49deba046e73fc)

 usr.sbin/mergemaster/mergemaster.8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)