Bug 274967 - mergemaster.8: postpone removal until 15
Summary: mergemaster.8: postpone removal until 15
Status: Closed FIXED
Alias: None
Product: Documentation
Classification: Unclassified
Component: Manual Pages (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Ed Maste
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-11-08 18:52 UTC by Christian Weisgerber
Modified: 2024-06-18 14:21 UTC (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2024-06-18 14:21:40 UTC 
A commit in branch stable/13 references this bug:

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

commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-16 14:19:14 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-06-18 14:20:41 +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)
    (cherry picked from commit c0e5d8f9bda7907c83901d25d1d123a5b180443f)

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