Skip site navigation (1)Skip section navigation (2)
Date:      30 Oct 1999 16:02:28 +0200
From:      naddy@mips.rhein-neckar.de (Christian Weisgerber)
To:        freebsd-questions@freebsd.org
Subject:   Re: CVSUP & buildworld
Message-ID:  <7vetpk$2p2t$1@bigeye.rhein-neckar.de>
References:  <3819DE31.5DE5344A@nisser.com> <Pine.BSF.4.10.9910300041040.17853-100000@propro.oldserver.demon.nl>

next in thread | previous in thread | raw e-mail | index | archive | help
Marc Schneiders <marc@oldserver.demon.nl> 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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7vetpk$2p2t$1>