From owner-freebsd-questions Sat Nov 27 1:10:17 1999 Delivered-To: freebsd-questions@freebsd.org Received: from 24-25-220-29.san.rr.com (24-25-220-29.san.rr.com [24.25.220.29]) by hub.freebsd.org (Postfix) with ESMTP id 25F4614D09 for ; Sat, 27 Nov 1999 01:10:14 -0800 (PST) (envelope-from DougB@simplenet.com) Received: from simplenet.com (master [10.0.0.2]) by 24-25-220-29.san.rr.com (8.9.3/8.8.8) with ESMTP id BAA72921; Sat, 27 Nov 1999 01:09:46 -0800 (PST) (envelope-from DougB@simplenet.com) Message-ID: <383F9FDA.261D648F@simplenet.com> Date: Sat, 27 Nov 1999 01:09:46 -0800 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.7 [en] (Win98; U) X-Accept-Language: en MIME-Version: 1.0 To: Christian Weisgerber Cc: freebsd-questions@freebsd.org Subject: Re: CVSUP & buildworld References: <3819DE31.5DE5344A@nisser.com> <7vetpk$2p2t$1@bigeye.rhein-neckar.de> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Christian Weisgerber wrote: > > Marc Schneiders wrote: > > [mergemaster] > > 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... > > mergemaster will only remove files in the temproot. The most harm > you can do is overwriting a customized file under /etc with the > distributed version. This is also a non-issue if you make a backup > copy of /etc beforehand. Quite right. > I'm considering porting mergemaster to OpenBSD. If you do, please let me know what has to be changed, and perhaps we can work together on making it more cross-platform. I've never run either of the other 'BSD's, so I'm not really familiar with the issues there, but hard disk is cheap nowadays... :) Thanks to everyone who contributed helpful comments and kind words about the script in this thread. Doug -- "Welcome to the desert of the real." - Laurence Fishburne as Morpheus, "The Matrix" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message