docs/186625: Handbook rebuilding "world" upgrade procedure wrong mergemaster command

[Allan Jude]

On 2014-02-27 08:50, Wout Decré wrote:
> The following reply was made to PR docs/186625; it has been noted by GNATS.
> 
> From: Wout =?ISO-8859-1?Q?Decr=E9?= <wout at canodus.be>
> To: freebsd-gnats-submit at FreeBSD.org, freebsd-doc at freebsd.org
> Cc:  
> Subject: Re: docs/186625: Handbook rebuilding "world" upgrade procedure
>  wrong mergemaster command
> Date: Thu, 27 Feb 2014 14:38:49 +0100
> 
>  On Mon, 2014-02-10 at 11:20 +0000, Wout Decr wrote:
>  > >Number:         186625
>  > >Category:       docs
>  > >Synopsis:       Handbook rebuilding "world" upgrade procedure wrong mergemaster command
>  > >Confidential:   no
>  > >Severity:       non-critical
>  > >Priority:       low
>  > >Responsible:    freebsd-doc
>  > >State:          open
>  > >Quarter:        
>  > >Keywords:       
>  > >Date-Required:
>  > >Class:          doc-bug
>  > >Submitter-Id:   current-users
>  > >Arrival-Date:   Mon Feb 10 11:30:00 UTC 2014
>  > >Closed-Date:
>  > >Last-Modified:
>  > >Originator:     Wout Decr
>  > >Release:        
>  > >Organization:
>  > Canodus
>  > >Environment:
>  > >Description:
>  > Under Procedure 23.2. Overview of Build World Process, step 9:
>  > 
>  > Update any remaining configuration files.
>  > 
>  > # mergemaster -p
>  > 
>  > It suggests you should do the mergemaster command two times with the -p option.
>  > 
>  > Before r43796, this was:
>  > 
>  > # mergemaster
>  > 
>  
>  Can someone confirm this? If it was a mistake, I think it should be
>  corrected soon, as people may not fully merge their /etc directory when
>  rebuilding world.
>  
>  Maybe a note can be added describing the -F option (ignore files which
>  differ only by VCS Id)?
>  
>  Cheers
>  
>  > 
>  > >How-To-Repeat:
>  > Check http://www.freebsd.org/doc/handbook/makeworld.html
>  > >Fix:
>  > I think this should just be:
>  > 
>  > # mergemaster
>  > 
>  > >Release-Note:
>  > >Audit-Trail:
>  > >Unformatted:
>  > _______________________________________________
>  > freebsd-doc at freebsd.org mailing list
>  > http://lists.freebsd.org/mailman/listinfo/freebsd-doc
>  > To unsubscribe, send any mail to "freebsd-doc-unsubscribe at freebsd.org"
>  
>  
> _______________________________________________
> freebsd-doc at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-doc
> To unsubscribe, send any mail to "freebsd-doc-unsubscribe at freebsd.org"
> 

Yes, the 2nd mergemaster (after installworld) should be without the -p

And yes, I think it would be a good idea to at least offer a <tip> about
using -F to avoid conflicts where the only difference is the VCS Id


-- 
Allan Jude

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-doc/attachments/20140227/ce4573f7/attachment.sig>