From nobody Tue Jun 18 14:21:40 2024 X-Original-To: doc@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 4W3TTJ5rGCz5Nt2R for ; Tue, 18 Jun 2024 14:21:40 +0000 (UTC) (envelope-from bugzilla-noreply@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 4W3TTJ4pnXz4SMc for ; Tue, 18 Jun 2024 14:21:40 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718720500; a=rsa-sha256; cv=none; b=KiuOG6G9Q+KfX595S1OODgtI8Ptk16NSk0B0KqI6oAqzwTgCsOlFHyJvsZbqPWlhsTXF+t zb+tYbZ81h/CCH6ZDwIZWtcceyHK+kDwx5DLmh6qqxM1aUkCh406eIVFPQhnamKW5otEMP 9WoNK8CVG1FXP+fPumNgKmruK3JqmQPUYDBlpzDw6YUak97ituVR+FtcdTe9EvIT8b9sal KteQfSbiROSmzLSWCV2HifvbGuO9PXD+z4N5W/KTthQaX1ShjGugzb56ydN67u0b5u4EOf 2he63geQgJmKZ7nEnhA6qFnBHF/FO26m+ByyMtYfoih5h7o8UOOXvAjJ8cPMFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718720500; 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: in-reply-to:in-reply-to:references:references; bh=8WfusY0j5STNMzgNcDoyIBsW4KkWU4SFxY3bDTRDhhg=; b=ctozphn5zGl0E589GDMQiZoipvTw/p2gb8+YzIK2Pg+Y2rrZmnXm57o4yAZXfeWSZslxm+ ikViT7AdK6mmqPt9OWHAkqD1hT8qv6EmSfsY2XqFf8vh8dqPL2++KKqKrLqEzRoW+5Mjlp N7NTUv/VqOBGowItCgArShGaOa7tPIP+JYePOnO/ZwMN2JTAtMd/hVmb3XNnBkvmgzEfXP 5AvUOKd9xMRN1zkHRkeDW6r1SArSqqgw8FEZA6EdbH1m+k/X4djIoZulbaoVDbwtGsM+QV baVQX3TtGrTvn0CqK/34g86CDkxhVYUXF6dPivq+RTFjKIpFK47/UebNFkbXZw== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4W3TTJ4R8gz12RW for ; Tue, 18 Jun 2024 14:21:40 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 45IELed5031940 for ; Tue, 18 Jun 2024 14:21:40 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 45IELeGi031939 for doc@FreeBSD.org; Tue, 18 Jun 2024 14:21:40 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 274967] mergemaster.8: postpone removal until 15 Date: Tue, 18 Jun 2024 14:21:40 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Documentation X-Bugzilla-Component: Manual Pages X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Closed X-Bugzilla-Resolution: FIXED X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: emaste@freebsd.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Documentation project List-Archive: https://lists.freebsd.org/archives/freebsd-doc List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-doc@FreeBSD.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D274967 --- Comment #3 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3D6e1a7ade216905cb8befde9eeb6af8e05= 27156ab commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste 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(-) --=20 You are receiving this mail because: You are on the CC list for the bug.=