From owner-freebsd-doc@FreeBSD.ORG  Thu Feb 27 13:47:19 2014
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3ED197B
 for <freebsd-doc@freebsd.org>; Thu, 27 Feb 2014 13:47:19 +0000 (UTC)
Received: from mail1.canodus2.canodus.be (mail1.canodus2.canodus.be
 [83.149.89.9]) by mx1.freebsd.org (Postfix) with ESMTP id 0152D1A28
 for <freebsd-doc@freebsd.org>; Thu, 27 Feb 2014 13:47:18 +0000 (UTC)
Received: by mail1.canodus2.canodus.be (Postfix, from userid 65534)
 id 07B5132ACE6; Thu, 27 Feb 2014 14:38:51 +0100 (CET)
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 mail1.canodus2.canodus.be
X-Spam-Level: 
X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00
 autolearn=ham version=3.3.2
Received: from [192.168.1.103] (94-224-50-199.access.telenet.be
 [94.224.50.199])
 by mail1.canodus2.canodus.be (Postfix) with ESMTPSA id 6140132AC92;
 Thu, 27 Feb 2014 14:38:49 +0100 (CET)
Message-ID: <1393508329.3711.12.camel@debian.wout-t440s>
Subject: Re: docs/186625: Handbook rebuilding "world" upgrade procedure
 wrong mergemaster command
From: Wout =?ISO-8859-1?Q?Decr=E9?= <wout@canodus.be>
To: freebsd-gnats-submit@FreeBSD.org, freebsd-doc@freebsd.org
Date: Thu, 27 Feb 2014 14:38:49 +0100
In-Reply-To: <201402101120.s1ABKECO052831@cgiserv.freebsd.org>
References: <201402101120.s1ABKECO052831@cgiserv.freebsd.org>
Organization: Canodus
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.8.5-2+b3 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc/>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Feb 2014 13:47:19 -0000

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@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-doc
> To unsubscribe, send any mail to "freebsd-doc-unsubscribe@freebsd.org"