From owner-freebsd-questions Sun Feb 17 18: 3: 7 2002 Delivered-To: freebsd-questions@freebsd.org Received: from probsd.ws (ilm25-53-085.ec.rr.com [24.25.53.85]) by hub.freebsd.org (Postfix) with ESMTP id 8FAC537B404 for ; Sun, 17 Feb 2002 18:03:05 -0800 (PST) Received: by probsd.ws (8.11.6/8.11.6) id g1I23xE58376 for freebsd-questions@FreeBSD.ORG; Sun, 17 Feb 2002 21:03:59 -0500 (EST) (envelope-from ms) Message-Id: <200202180203.g1I23xE58376@probsd.ws> Content-Type: text/plain; charset="iso-8859-1" From: Michael Sharp To: freebsd-questions@FreeBSD.ORG Subject: Mergemaster Date: Sun, 17 Feb 2002 21:03:59 -0500 X-Mailer: KMail [version 1.3.2] MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I'm kinda new to FreeBSD and I am about to do the -RELEASE to -STABLE procedure. I'm a little confused as to what mergemaster does, and what I should do.. whether install the temp, or delete, or merge. As I understand it, if you have self-edited files in the /etc directory and you want to keep those changes, you dont install the temp file and leave it for later. However, if you havent self-edited a /etc file, its best to install it. Am I correct? What 'merge' does, I have no idea? Someone mind clarifying what mergemaster does, is it ok to skip the process? michael To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message