From owner-freebsd-questions@FreeBSD.ORG Tue Aug 12 02:29:21 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E79C37B401 for ; Tue, 12 Aug 2003 02:29:21 -0700 (PDT) Received: from pop018.verizon.net (pop018pub.verizon.net [206.46.170.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E75043F93 for ; Tue, 12 Aug 2003 02:29:20 -0700 (PDT) (envelope-from mike@pcmedx.com) Received: from duron.pcmedx.com ([4.46.1.67]) by pop018.verizon.net (InterMail vM.5.01.05.33 201-253-122-126-133-20030313) with ESMTP id <20030812092919.TNNX11703.pop018.verizon.net@duron.pcmedx.com>; Tue, 12 Aug 2003 04:29:19 -0500 Received: from localhost (localhost [127.0.0.1]) by duron.pcmedx.com (Postfix) with ESMTP id 1C64DACBC; Tue, 12 Aug 2003 02:29:19 -0700 (PDT) Received: from mike (mike.pcmedx.com [192.168.240.244]) by duron.pcmedx.com (Postfix) with SMTP id 7DCA6AC8E; Tue, 12 Aug 2003 02:29:18 -0700 (PDT) Message-ID: <000701c360b4$3c510bb0$f4f0a8c0@pcmedx.com> From: "Mike Maltese" To: References: <20030812025041.41230bb9.epilogue@attcanada.ca> Date: Tue, 12 Aug 2003 02:29:31 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1158 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165 X-Virus-Scanned: by amavisd (http://www.amavis.org) and f-prot (http://www.f-prot.com) at pcmedx.com X-Authentication-Info: Submitted using SMTP AUTH at pop018.verizon.net from [4.46.1.67] at Tue, 12 Aug 2003 04:29:19 -0500 cc: epilogue@attcanada.ca Subject: Re: mergemaster clarification X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2003 09:29:21 -0000 > possible. various sources (handbook, man page, absolute bsd, google) indicated > that mergemaster would compare files for differences. it did, but it only presented > 4 different files. i had the impression that mergemaster would run through *all* the > files in /etc. was i wrong to expect this? Kinda. Mergemaster will only attempt to merge files that are different from source. Either the four files it compared were modified by you in the configuration of your system, or they were updated in the source tree (or both). > my cvsup file includes this line -- *default release=cvs tag=RELENG_4_8. if i > understand the cvsup instructions correctly, this means i should only get > code for security advisories and other seriously critical fixes. the original install Yes. > > does this mean that make world only rebuilds part of the code and not the whole > system? could this be why mergemaster did not ask me about all the files in /etc? The make buildworld process will build everything and make installworld will replace everything (and if I'm wrong here I'm sure someone will correct me). Hope this helps - Mike