From lowell@be-well.no-ip.com  Sat Feb  7 08:58:41 2004
Return-Path: <lowell@be-well.no-ip.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 97E1516A4D2; Sat,  7 Feb 2004 08:58:41 -0800 (PST)
Received: from rwcrmhc13.comcast.net (rwcrmhc13.comcast.net [204.127.198.39])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8EEAC43D1F; Sat,  7 Feb 2004 08:58:41 -0800 (PST)
	(envelope-from lowell@be-well.no-ip.com)
Received: from be-well.no-ip.com ([66.30.196.44])
          by comcast.net (rwcrmhc13) with ESMTP
          id <2004020716584101500k5fnje>; Sat, 7 Feb 2004 16:58:41 +0000
Received: by be-well.no-ip.com (Postfix, from userid 1147)
	id 8E1EA11; Sat,  7 Feb 2004 11:58:40 -0500 (EST)
Message-Id: <20040207165840.8E1EA11@be-well.no-ip.com>
Date: Sat,  7 Feb 2004 11:58:40 -0500 (EST)
From: Lowell Gilbert <freebsd-bugs-local@be-well.no-ip.com>
Reply-To: Lowell Gilbert <freebsd-bugs-local@be-well.no-ip.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Mergemaster guy <doubg@freebsd.org>
Subject: (mergemaster) does pre-buildworld really mean that?
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62484
>Category:       docs
>Synopsis:       (mergemaster) does pre-buildworld really mean that?
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 07 09:00:33 PST 2004
>Closed-Date:    Sat Feb 07 22:22:11 PST 2004
>Last-Modified:  Sat Feb 07 22:22:11 PST 2004
>Originator:     Lowell Gilbert
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD be-well.ilk.org 4.9-STABLE FreeBSD 4.9-STABLE #62: Mon Feb 2 12:30:09 EST 2004 root@be-well.ilk.org:/usr/src/sys/compile/BE-WELL i386


	
>Description:
	

The -p option for mergemaster is described as the
"pre-buildworld" option, but we actually advise using it
immediately before installworld.  Either one will work fine
as far as I can recall, but the difference has confused at
least one person on comp.unix.bsd.freebsd.misc.

>How-To-Repeat:
	
>Fix:

	

The easiest tweak would be to move the "mergemaster -p" to
immediately before the buildworld in the Handbook's
"Canonical Way to Update Your System".
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->dougb 
Responsible-Changed-By: schweikh 
Responsible-Changed-When: Sat Feb 7 09:25:28 PST 2004 
Responsible-Changed-Why:  
Over to mergemaster maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62484 

From: Marc Fonvieille <blackend@FreeBSD.org>
To: Lowell Gilbert <freebsd-bugs-local@be-well.no-ip.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org,
	Mergemaster guy <doubg@FreeBSD.org>
Subject: Re: docs/62484: (mergemaster) does pre-buildworld really mean that?
Date: Sat, 7 Feb 2004 18:31:54 +0100

 On Sat, Feb 07, 2004 at 11:58:40AM -0500, Lowell Gilbert wrote:
 > >Description:
 > 	
 > 
 > The -p option for mergemaster is described as the
 > "pre-buildworld" option, but we actually advise using it
 > immediately before installworld.  Either one will work fine
 > as far as I can recall, but the difference has confused at
 > least one person on comp.unix.bsd.freebsd.misc.
 > 
 > >How-To-Repeat:
 > 	
 > >Fix:
 > 
 > 	
 > 
 > The easiest tweak would be to move the "mergemaster -p" to
 > immediately before the buildworld in the Handbook's
 > "Canonical Way to Update Your System".
 
 To be simple: the -p option is seen as a pre-installworld option, when
 a special file/thing is needed to buildworld, it is mentionned in
 /usr/src/UPDATING (by the way, the same commands order is given in this
 file).  We can also add that is safiest to do the "mergemaster -p" after
 the reboot in case of a bad kernel etc.
 
 In the Handbook we give a "general procedure", this procedure will
 be ok in 99.99% of cases, it's why the reader should read the rest of
 the chapter :)
 
 Marc

From: Lowell Gilbert <freebsd-bugs-local@be-well.no-ip.com>
To: Marc Fonvieille <blackend@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org,
	Mergemaster guy <dougb@FreeBSD.org>
Subject: Re: docs/62484: (mergemaster) does pre-buildworld really mean that?
Date: 07 Feb 2004 13:09:36 -0500

 Marc Fonvieille <blackend@FreeBSD.org> writes:
 
 > On Sat, Feb 07, 2004 at 11:58:40AM -0500, Lowell Gilbert wrote:
 > > >Description:
 > > 	
 > > 
 > > The -p option for mergemaster is described as the
 > > "pre-buildworld" option, but we actually advise using it
 > > immediately before installworld.  Either one will work fine
 > > as far as I can recall, but the difference has confused at
 > > least one person on comp.unix.bsd.freebsd.misc.
 > > 
 > > >How-To-Repeat:
 > > 	
 > > >Fix:
 > > 
 > > 	
 > > 
 > > The easiest tweak would be to move the "mergemaster -p" to
 > > immediately before the buildworld in the Handbook's
 > > "Canonical Way to Update Your System".
 > 
 > To be simple: the -p option is seen as a pre-installworld option, when
 > a special file/thing is needed to buildworld, it is mentionned in
 > /usr/src/UPDATING (by the way, the same commands order is given in this
 > file).  We can also add that is safiest to do the "mergemaster -p" after
 > the reboot in case of a bad kernel etc.
 
 Okay, then the appropriate tweak would be to change the manual and the
 program itself for mergemaster, which both refer to "-p" as
 "pre-buildworld".
 
     [1003] (be-well) lowell> mergemaster -h |grep buildworld
       -p  Pre-buildworld mode, only compares crucial files
     [1004] (be-well) lowell> man mergemaster | grep buildworld
          -p          Pre-buildworld mode.  Compares only files known to be essen-
     [1005] (be-well) lowell> 
 
 > In the Handbook we give a "general procedure", this procedure will
 > be ok in 99.99% of cases, it's why the reader should read the rest of
 > the chapter :)
 
 I'm not sure what your quote marks are for.  The Handbook *says* that
 the procedure is "canonical," which is a fairly strong statement.
 Should the handbook section title be changed to say "general" or
 "typical"?  And 99.99% of the time "mergemaster -p" isn't needed at
 *all*, but I don't think that's an argument for taking it out of the
 Handbook. :-)
 
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Sat Feb 7 22:19:48 PST 2004 
State-Changed-Why:  

Thanks for your submission, but I think the man page is 
clear here. It's actually more useful to run -p before 
buildworld as it also gives you a chance to check your 
make.conf variables (if any exist). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62484 
>Unformatted:
