From owner-freebsd-stable Sun Oct 13 16:52:32 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 498FF37B401 for ; Sun, 13 Oct 2002 16:52:31 -0700 (PDT) Received: from ice.wonderworks.com (ice.WonderWorks.com [192.203.206.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id B959643E9C for ; Sun, 13 Oct 2002 16:52:30 -0700 (PDT) (envelope-from kyle_jones@wonderworks.com) Received: by ice.wonderworks.com id g9DNq3Tx013669; Sun, 13 Oct 2002 16:52:03 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15786.1827.305324.786368@ice.wonderworks.com> Date: Sun, 13 Oct 2002 16:52:03 -0700 From: Kyle Jones To: Matthew Dillon Cc: "Crist J. Clark" , Trish Lynch , Adrian Wontroba , chris scott , freebsd-stable@FreeBSD.ORG Subject: Re: Ifconfig config of gif tunnels In-Reply-To: <200210132154.g9DLsUmc057065@apollo.backplane.com> References: <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org> <20021013214642.GB90169@blossom.cjclark.org> <200210132154.g9DLsUmc057065@apollo.backplane.com> X-Mailer: VM 7.07 under 21.4 (patch 8) "Honest Recruiter" XEmacs Lucid X-Face: /cA45WHG7jWq>(O3&Z57Y<"WsX5ddc,4c#w0F*zrV#=M 0@~@,s;b,aMtR5Sqs"+nU.z^CSFQ9t`z2>W,S,]:[+2^ Nbf6v4g>!&,7R4Ot4Wg{&tm=WX7P["9%a)_da48-^tGy ,qz]Z,Zz\{E.,]'EO+F)@$KtF&V 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 aMatthew Dillon writes: > 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. I agree with (1), but (2) and (3) should be options. If you've keeping track of output in an xterm scroll buffer clearing the screen will lose some output. And sometimes an overview of the changes is good so you can tell whether it's worth going through them interactively or just accepting/denying them all. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message