From owner-freebsd-questions Wed Dec 13 10:13:50 2000 From owner-freebsd-questions@FreeBSD.ORG Wed Dec 13 10:13:47 2000 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id 83B2A37B402 for ; Wed, 13 Dec 2000 10:13:47 -0800 (PST) Received: from FreeBSD.org (Studded@master [10.0.0.2]) by dt051n37.san.rr.com (8.9.3/8.9.3) with ESMTP id KAA75694; Wed, 13 Dec 2000 10:13:45 -0800 (PST) (envelope-from DougB@FreeBSD.org) Sender: doug@dt051n37.san.rr.com Message-ID: <3A37BC59.115C4737@FreeBSD.org> Date: Wed, 13 Dec 2000 10:13:45 -0800 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.12 i386) X-Accept-Language: en MIME-Version: 1.0 To: Gilles.Guerrini@alcatel.fr Cc: freebsd-questions@FreeBSD.org Subject: Re: mergemaster References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Gilles.Guerrini@alcatel.fr wrote: > > Hello, > i want to update my FreeBSD from 4.1 release to 4.2 RELEASE. What a good idea !! > When I do a 'mergemaster', by default, if there is no personnal change, must I 'delete' the new file > or must I 'install' it ?? You should really install the new files if there are no personal changes, and if you do have personal changes you should merge the old with the new, then install that file. Doug -- So what I want to know is, where does the RED brick road go? Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message