Bug 38483

Summary: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
Product: Base System Reporter: Chris Pepper <pepper>
Component: i386Assignee: freebsd-doc (Nobody) <doc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 4.5-RELEASE   
Hardware: Any   
OS: Any   

Description Chris Pepper 2002-05-24 05:20:01 UTC 
<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.

Fix: 

Correct the reference to 4.6-RELEASE with the actual appearance of mergemaster's -p option.
Comment 1 Johan Karlsson freebsd_committer freebsd_triage 2002-06-05 01:53:27 UTC 
Responsible Changed
From-To: freebsd-bugs->freebsd-docs

Over to docs.
Comment 2 Bruce A. Mah freebsd_committer freebsd_triage 2002-06-05 04:04:10 UTC 
State Changed
From-To: open->closed
Comment 3 Bruce A. Mah freebsd_committer freebsd_triage 2002-06-05 04:06:22 UTC 
State Changed
From-To: closed->open

Argh.  Closed by mistake, sorry about that. 

I'm not 100% sure that anything needs to be done for this PR, since 
generally the handbook and manpages only "count" releases for the 
purposes of changes.  I started closing the PR with a message to that 
effect, but changed my mind.
Comment 4 Giorgos Keramidas freebsd_committer freebsd_triage 2002-06-05 23:07:08 UTC 
On 2002-06-04 20:08 -0700, bmah@FreeBSD.ORG wrote:
> Synopsis: >http://www.freebsd.org/handbook/makeworld.html? says mergemaster's -p is since 4.6-RELEASE
> 
> State-Changed-From-To: closed->open
> State-Changed-By: bmah
> State-Changed-When: Tue Jun 4 20:06:22 PDT 2002
> State-Changed-Why: 
> Argh.  Closed by mistake, sorry about that.
> 
> I'm not 100% sure that anything needs to be done for this PR, since
> generally the handbook and manpages only "count" releases for the
> purposes of changes.  I started closing the PR with a message to that
> effect, but changed my mind.

This PR can be closed.  The -p option of mergemaster appeared in
revision 1.27 of src/usr.sbin/mergemaster/mergemaster.sh which
appeared in the repository in Feb 2002.  This is after 4.5-RELEASE.
The Handbook is correct.  The "first release that mergemaster will
support the -p option, is going to be 4.6-RELEASE, when that it out."

Giorgos.
Comment 5 Bruce A. Mah freebsd_committer freebsd_triage 2002-06-06 02:00:20 UTC 
State Changed
From-To: open->closed

kerimada and I seem to agree that the Handbook is correct as written 
(see audit trail for details).
Comment 6 Ceri Davies freebsd_committer freebsd_triage 2003-11-24 20:20:03 UTC 
Responsible Changed
From-To: freebsd-docs->freebsd-doc

Lint Responsible.