From owner-freebsd-questions Sat Oct 30 8:31:40 1999 Delivered-To: freebsd-questions@freebsd.org Received: from news-ma.rhein-neckar.de (news-ma.rhein-neckar.de [193.197.90.3]) by hub.freebsd.org (Postfix) with ESMTP id E009A1513F for ; Sat, 30 Oct 1999 08:31:24 -0700 (PDT) (envelope-from daemon@bigeye.rhein-neckar.de) Received: from bigeye.rhein-neckar.de (uucp@localhost) by news-ma.rhein-neckar.de (8.8.8/8.8.8) with bsmtp id RAA25573 for freebsd-questions@freebsd.org; Sat, 30 Oct 1999 17:31:23 +0200 (CEST) (envelope-from daemon@bigeye.rhein-neckar.de) Received: (from daemon@localhost) by bigeye.rhein-neckar.de (8.9.3/8.9.3) id QAA91243 for freebsd-questions@freebsd.org; Sat, 30 Oct 1999 16:02:29 +0200 (CEST) (envelope-from daemon) From: naddy@mips.rhein-neckar.de (Christian Weisgerber) Subject: Re: CVSUP & buildworld Date: 30 Oct 1999 16:02:28 +0200 Message-ID: <7vetpk$2p2t$1@bigeye.rhein-neckar.de> References: <3819DE31.5DE5344A@nisser.com> To: freebsd-questions@freebsd.org Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. > It is not as difficult and tedious as it looks. I used to do this manually, too. However, now that mergemaster has been imported into the system in -CURRENT I switched to using it. Sure, mergemaster doesn't do anything you wouldn't do in a very similar fashion manually, but it certainly saves typing. I'm considering porting mergemaster to OpenBSD. -- Christian "naddy" Weisgerber naddy@mips.rhein-neckar.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message