From owner-freebsd-questions Fri Oct 29 18:23:14 1999 Delivered-To: freebsd-questions@freebsd.org Received: from mail.greatbasin.net (mail.greatbasin.net [207.228.35.39]) by hub.freebsd.org (Postfix) with ESMTP id 228A914E48 for ; Fri, 29 Oct 1999 18:22:50 -0700 (PDT) (envelope-from dan@jgl.reno.nv.us) Received: from jgl.reno.nv.us (rno-max4-35.gbis.net [207.228.61.35]) by mail.greatbasin.net (8.9.3/8.9.3) with ESMTP id SAA04892; Fri, 29 Oct 1999 18:22:47 -0700 (PDT) Received: from danco (danco.home [10.0.0.2]) by jgl.reno.nv.us (8.9.3/8.9.3) with SMTP id SAA98148; Fri, 29 Oct 1999 18:22:44 -0700 (PDT) (envelope-from dan@jgl.reno.nv.us) Message-ID: <00eb01bf2275$40e17a60$0200000a@danco.home> From: "Dan O'Connor" To: "Marc Schneiders" Cc: "freebsd-questions" Subject: Re: CVSUP & buildworld Date: Fri, 29 Oct 1999 18:22: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 4.72.3155.0 X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3155.0 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >I personally prefer to do it by hand. One slip of the finger and >mergemaster has removed a file you do not want to loose... It is not >as difficult and tedious as it looks. You can loose all the files in >/etc that are form the date and time you installed last time. Only the >rest should be compared for your own additions/changes. I used to do it by hand, but once I used mergemaster I was hooked. Of course, I do a 'cp -Rp /etc /etc.old' before I start, just in case :-) --Dan To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message