From owner-freebsd-doc@FreeBSD.ORG Thu Feb 27 17:51:56 2014 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8900CD3D for ; Thu, 27 Feb 2014 17:51:56 +0000 (UTC) Received: from mx1.scaleengine.net (beauharnois2.bhs1.scaleengine.net [142.4.218.15]) by mx1.freebsd.org (Postfix) with ESMTP id 456A01288 for ; Thu, 27 Feb 2014 17:51:55 +0000 (UTC) Received: from [10.1.1.1] (S01060001abad1dea.hm.shawcable.net [50.70.146.73]) (Authenticated sender: allan.jude@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 0BE0361CD2 for ; Thu, 27 Feb 2014 17:51:54 +0000 (UTC) Message-ID: <530F7B3A.3000404@allanjude.com> Date: Thu, 27 Feb 2014 12:51:54 -0500 From: Allan Jude User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: freebsd-doc@freebsd.org Subject: Re: docs/186625: Handbook rebuilding "world" upgrade procedure wrong mergemaster command References: <201402271350.s1RDo1JT063631@freefall.freebsd.org> In-Reply-To: <201402271350.s1RDo1JT063631@freefall.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hSNQwRhd9L5D8nBESSl0gap08teif5baS" X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 17:51:56 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hSNQwRhd9L5D8nBESSl0gap08teif5baS Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 2014-02-27 08:50, Wout Decr=E9 wrote: > The following reply was made to PR docs/186625; it has been noted by GN= ATS. >=20 > From: Wout =3D?ISO-8859-1?Q?Decr=3DE9?=3D > To: freebsd-gnats-submit@FreeBSD.org, freebsd-doc@freebsd.org > Cc: =20 > Subject: Re: docs/186625: Handbook rebuilding "world" upgrade procedure= > wrong mergemaster command > Date: Thu, 27 Feb 2014 14:38:49 +0100 >=20 > 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: =20 > > >Keywords: =20 > > >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: =20 > > >Organization: > > Canodus > > >Environment: > > >Description: > > Under Procedure 23.2. Overview of Build World Process, step 9: > >=20 > > Update any remaining configuration files. > >=20 > > # mergemaster -p > >=20 > > It suggests you should do the mergemaster command two times with the= -p option. > >=20 > > Before r43796, this was: > >=20 > > # mergemaster > >=20 > =20 > 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 whe= n > rebuilding world. > =20 > Maybe a note can be added describing the -F option (ignore files which= > differ only by VCS Id)? > =20 > Cheers > =20 > >=20 > > >How-To-Repeat: > > Check http://www.freebsd.org/doc/handbook/makeworld.html > > >Fix: > > I think this should just be: > >=20 > > # mergemaster > >=20 > > >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.or= g" > =20 > =20 > _______________________________________________ > 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" >=20 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 about using -F to avoid conflicts where the only difference is the VCS Id --=20 Allan Jude --hSNQwRhd9L5D8nBESSl0gap08teif5baS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTD3s6AAoJEJrBFpNRJZKfRrIP/2wtT/Gf62uHHI2NH9RsOJYj 6uIRcZXjwugFL+FeUEWc2+ksw2LPKbQC71uQB+TkgcuIPL8Ci5eGXxc+Ki4DPRnK A1IBeEw6751eTAK/KgSsV4TgT3c8/ZWudLbEMJH5LRqf6Cl2JymimnBqb6/yyPu4 dnGoEZHyxJyzFPqQ4iiSSbg8lKdc3oCsgj78b8ZL3U8P3fICKP9jD9bSXTL1leYw xdp+XFJh+16o6Ewf3jMr8hIwkyRzY3yORknp0ODpH3OWBcY7Xp4GcQZejUSNkIGO vlrPXs9CbYbVLf1mUlScUrf8RpPdIKQRGjUw+PvnDRSzCbXUkC7w7K9H3DyK9DzJ lSb8tvkoA7pcfgEHKiScFDnCgg9g4w81LhChz1RoZxoq9zTIFzrB9lL/f2Dzmz3J GSaATbJDTMcsMiW+o8zojd6Ede+Jkz1cyBWOXTxI5WkI7brAcfE/J2spLGx+tgOR dL0VSikhuHqqF9HMFIrgE8jwAEc9CrbEEMsQndl+NYF/EopG/IY5mZdm9zI0Yg9s 3fZuqTVEsQ716BLUdH87zX9z7WmN5uQr/DK+Qm9g/WCJEljNjcRmHjflPXYBJghc MjLrLPIOfjUms0ZLCg10hCQsCNTOcqVSxWJrxutx+GeD49FCNMT8Te3hZP2NZQjB orjLi4UwhFhzGyS5dG5m =6O8x -----END PGP SIGNATURE----- --hSNQwRhd9L5D8nBESSl0gap08teif5baS--