Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Oct 2002 14:54:30 -0700 (PDT)
From:      Matthew Dillon <dillon@apollo.backplane.com>
To:        "Crist J. Clark" <crist.clark@attbi.com>
Cc:        Trish Lynch <trish@bsdunix.net>, Adrian Wontroba <aw1@stade.co.uk>, chris scott <c.scott@uk.tiscali.com>, freebsd-stable@FreeBSD.ORG
Subject:   Re: Ifconfig config of gif tunnels
Message-ID:  <200210132154.g9DLsUmc057065@apollo.backplane.com>
References:  <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org> <20021013214642.GB90169@blossom.cjclark.org>

next in thread | previous in thread | raw e-mail | index | archive | help

:Ewww. That kind of defeats the whole purpose of mergemaster(8). The
:whole idea is for a human to sit at the console and decide what
:changes need to be made. With your system, you'll lose any changes to
:master.passwd or group (like the recent addition of the sshd
:user/group). (Although I'll admit that changing the hosts file is one
:that I wouldn't mind skipping everytime.) You might as well just copy
:your files out of the way, run the make commands mergemaster(8) does,
:and then move the files back. Mergemaster(8) doesn't really buy you
:anything the way you are using it.
:
:Actually, you probably really should be using the '-a' option to
:mergemaster(8), and then go back later to see what else you need to
:update.
:-- 
:Crist J. Clark                     |     cjclark@alum.mit.edu

    I would like mergemaster a whole lot more if:

    (1) It just overwrote system files that users are not supposed to
	change anyway, like files in /etc/defaults and the /etc/rc* 
	files.

    (2) It cleared the window before each presentation, so I don't
	have to search around the window to find the filename and/or
	diff that it's currently asking me to do something about
	(this is especially annoying for small files).

    (3) It didn't try to display the whole diff initially, causing
	a pipe-to-(less or more) that I then have to quit out of 
	before I can tell it to install / delete.  Blech.

    Sorry, just venting.  Mergemaster is just one of those programs
    which does important things but goes about it in an unbelievably
    annoying and unobvious fashion.

						-Matt


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210132154.g9DLsUmc057065>