From owner-freebsd-stable Tue Oct 15 5:27: 3 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2582137B401 for ; Tue, 15 Oct 2002 05:27:02 -0700 (PDT) Received: from bunrab.catwhisker.org (adsl-63-193-123-122.dsl.snfc21.pacbell.net [63.193.123.122]) by mx1.FreeBSD.org (Postfix) with ESMTP id 944F243E9C for ; Tue, 15 Oct 2002 05:27:01 -0700 (PDT) (envelope-from david@catwhisker.org) Received: from bunrab.catwhisker.org (localhost [127.0.0.1]) by bunrab.catwhisker.org (8.12.6/8.12.6) with ESMTP id g9FCQwOp031968; Tue, 15 Oct 2002 05:26:58 -0700 (PDT) (envelope-from david@bunrab.catwhisker.org) Received: (from david@localhost) by bunrab.catwhisker.org (8.12.6/8.12.6/Submit) id g9FCQw0L031967; Tue, 15 Oct 2002 05:26:58 -0700 (PDT) (envelope-from david) Date: Tue, 15 Oct 2002 05:26:58 -0700 (PDT) From: David Wolfskill Message-Id: <200210151226.g9FCQw0L031967@bunrab.catwhisker.org> To: shamrock@cypherpunks.to Subject: Re: Mergemaster [was: Re: Ifconfig config of gif tunnels] Cc: stable@freebsd.org In-Reply-To: <004401c2742a$d6169d90$6501a8c0@VAIO650> Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG >From: "Lucky Green" >Date: Tue, 15 Oct 2002 02:11:22 -0700 >... What would also be >helpful, though this may be diff's fault, would be if there were less >tendency for mergemaster to combine changes the admin likely wants to >make (adding a new user the OS requires) with changes the admin does not >want to make (removing surrounding entries out of master.passwd), >requiring the admin to make a note of mergemaster's suggestions followed >by editing the file by hand. Even to the extent that this happens, it "requires" no such response from the person running mergemaster. Rather, consider using the "e b" response to "edit both [old and new sets of lines]". Cheers, david (links to my resume at http://www.catwhisker.org/~david) -- David H. Wolfskill david@catwhisker.org To paraphrase David Hilbert, there can be no conflicts between the discipline of systems administration and Microsoft, since they have nothing in common. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message