From nobody Thu Apr 18 14:20:29 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 4VL0L66G0kz5Gxs3 for ; Thu, 18 Apr 2024 14:20:30 +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 4VL0L63k8Sz4XlW for ; Thu, 18 Apr 2024 14:20:30 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713450030; a=rsa-sha256; cv=none; b=aByq42SayllTXdbENlOG5j4Nopj08IjsUUxahsgx8Iea+XIeAaR6+3w5KrDYTO7SkiM+c4 eJLLqcDEP81+q5+zx/r3tLagrw+rdPqxR2H0ah5JljUdMTZ6r4fo+y0l/wp1/XMkv3x3s3 Hhq+l2fwi7DJh+Iuz3ywuPRCBc/02C2mWV0/8/0Nh0cLnemkr3TH5rIcheQqWJxZjsCN0F uz2UnG/kTAydX70CukUc8Xq9WYMwCTnzWr6AWIMC5aVCyw5HQOcmmE3wDzsfF8oLOqMtsP UA3gnqAjp+THpV2aXyFv3+PXOhi+Z40PmRAI6faHAwo+tpRZKTyVQ7EX6zm7MQ== 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=1713450030; 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=0r64AexUO7LiO1A0gXi4bq8oA2uutF6axUc+aqlCmak=; b=Zebq0dccd+uGVnZNDbqJuF/K8OT3Bo3V9o32brwQ38YFup4qn71waOti+4og6MjhKlNhaX U9a7w7+HE06hCAiPU6xpeo5rwBhaJJQe5xm9w1L/yeniY6NmiZpY0ptV4LpzXotSAdg0WE vIspPGxaNtxU5b+aWc9+b3m0HxgQlKCKKf6CcmCtEBCAKkCZwTXKZNzjEP29NZyE5XmnLN 4WK8FGMXeQJbKt5MeTQMXxO1kioX7pTmWJzouParQwhDSvzT3V0n54Cn/UJPLcnqTcPIz6 Hzp9aUt2y7Z0i+RPcFy5mZAmvelqZoZ6cqkpXY26hJHmtuxwreDyG2qSb0G4Yg== 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 4VL0L63DJ2z1CRH for ; Thu, 18 Apr 2024 14:20:30 +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 43IEKUiI064937 for ; Thu, 18 Apr 2024 14:20:30 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 43IEKUFK064936 for doc@FreeBSD.org; Thu, 18 Apr 2024 14:20:30 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: Thu, 18 Apr 2024 14:20:29 +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: In Progress X-Bugzilla-Resolution: 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 #2 from commit-hook@FreeBSD.org --- A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc0e5d8f9bda7907c83901d25d1d123a5b= 180443f commit c0e5d8f9bda7907c83901d25d1d123a5b180443f Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste 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(-) --=20 You are receiving this mail because: You are on the CC list for the bug.=