From owner-freebsd-bugs  Thu May 23 21:20: 9 2002
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E9A9737B40A
	for <freebsd-bugs@hub.freebsd.org>; Thu, 23 May 2002 21:20:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4O4K1H75239;
	Thu, 23 May 2002 21:20:01 -0700 (PDT)
	(envelope-from gnats)
Received: from nwww.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id B287D37B403
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 May 2002 21:10:31 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g4O4AVhG032139
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 May 2002 21:10:31 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.2/8.12.2/Submit) id g4O4AVYH032138;
	Thu, 23 May 2002 21:10:31 -0700 (PDT)
Message-Id: <200205240410.g4O4AVYH032138@www.freebsd.org>
Date: Thu, 23 May 2002 21:10:31 -0700 (PDT)
From: Chris Pepper <pepper@rockefeller.edu>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: i386/38483: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         38483
>Category:       i386
>Synopsis:       >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 23 21:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Chris Pepper
>Release:        4.5-RELEASE
>Organization:
Rockefeller University
>Environment:
FreeBSD guest.reppep.com 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002     murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC  i386

>Description:
<http://www.freebsd.org/handbook/makeworld.html> says:

Since 4.6-RELEASE you can run  mergemaster(8) in pre-buildworld mode by providing the -p option. This will compare only those files that are essential for the success of buildworld or installworld. If your old version of mergemaster does not support -p, use the new version in the source tree when running for the first time:

Actually, -p is is available before 4.6-RELEASE, but I'm not sure when it appeared.
>How-To-Repeat:

>Fix:
Correct the reference to 4.6-RELEASE with the actual appearance of mergemaster's -p option.
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message