From owner-freebsd-questions@FreeBSD.ORG Mon Aug 11 23:47:48 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 A21A837B401 for ; Mon, 11 Aug 2003 23:47:48 -0700 (PDT) Received: from outbox.allstream.net (outbox.allstream.net [207.245.244.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E81143FAF for ; Mon, 11 Aug 2003 23:47:48 -0700 (PDT) (envelope-from epilogue@attcanada.ca) Received: from localhost (mon-pq68-166.dial.allstream.net [216.123.143.150]) by outbox.allstream.net (Postfix) with SMTP id D6B0E6AAD for ; Tue, 12 Aug 2003 02:47:45 -0400 (EDT) Date: Tue, 12 Aug 2003 02:50:41 -0400 From: epilogue@attcanada.ca To: freebsd-questions@freebsd.org Message-Id: <20030812025041.41230bb9.epilogue@attcanada.ca> X-Mailer: Sylpheed version 0.9.0 (GTK+ 1.2.10; i386-portbld-freebsd4.8) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: 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 06:47:48 -0000 hello world, yesterday, i made my first attempt at upgrading my system. my machine seems happy today, so my guess is that everthing worked just fine, but i'm new to this, so i'm not really certain. since a misstep rebuilding the guts of your system has the potential to wreak great havoc, i read up on the process and followed the steps as closely as 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? 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 of my system came from the 4.8 cdrom. uname -a now reads "FreeBSD 4.8-RELEASE-p3". i'm thinking that p3 = patch 3, so that looks good. 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? hoping that someone with more experience can shed a little light on this for me. thank you in advance, epilogue